Skip to content

Commit

Permalink
prepare cran release
Browse files Browse the repository at this point in the history
  • Loading branch information
pvictor committed Nov 27, 2019
1 parent 2513bc5 commit e0b6e28
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 29 deletions.
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Package: apexcharter
Version: 0.1.2.930
Version: 0.1.3
Title: Create Interactive Chart with the JavaScript 'ApexCharts' Library
Description: Provides an 'htmlwidgets' interface to 'apexcharts.js'.
'Apexcharts' is a modern JavaScript charting library to build interactive charts and visualizations with simple API.
'Apexcharts' examples and documentation are available here: <https://apexcharts.com/>.
Authors@R: c(
person("Victor", "Perrier", email = "[email protected]", role = c("aut", "cre")),
person("Fanny", "Meyer", email = "[email protected]", role = "aut"),
person("Juned", "Chhipa", role = "cph", comment = "apexcharts.js library"))
person("Juned", "Chhipa", role = "cph", comment = "apexcharts.js library"),
person("Mike", "Bostock", role = "cph", comment = "d3.format library"))
License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apexcharter 0.1.3
apexcharter 0.1.2
==================

* Update ApexCharts to 3.8.2
* Upgraded ApexCharts.js to 3.8.2
* Set parent container height to 0 by default (fix [#2](https://github.com/dreamRs/apexcharter/issues/2)).


Expand Down
2 changes: 1 addition & 1 deletion R/apex-utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ ax_annotations <- function(ax,
#' @param defaultLocale Locale to use : \code{"de"}, \code{"el"}, \code{"en"}, \code{"es"}, \code{"fr"},
#' \code{"hi"}, \code{"hr"}, \code{"hy"}, \code{"id"}, \code{"it"}, \code{"ko"}, \code{"pt-br"},
#' \code{"ru"}, \code{"tr"}, \code{"ua"}.
#' @param locales Array of custom localizations paremeters.
#' @param locales Array of custom locales parameters.
#' @param animations A list of parameters.
#' @param background Background color for the chart area. If you want to set background with css, use \code{.apexcharts-canvas} to set it.
#' @param foreColor Sets the text color for the chart. Defaults to \code{#373d3f}.
Expand Down
6 changes: 3 additions & 3 deletions R/data.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#' \item{\code{continent_residence}}{Continent of origin of population}
#' \item{\code{continent_origin}}{Continent of residence of population}
#' }
#' @source UNHCR (The UN Refugee Agency) (\url{http://popstats.unhcr.org/en/overview})
#' @source UNHCR (The UN Refugee Agency) (\url{https://www.unhcr.org/})
"unhcr_popstats_2017"


#' UNHCR data by continent of origin
#'
#' The dataset contains data about UNHCR's populations of concern summarised by continent of orginin.
#' The dataset contains data about UNHCR's populations of concern summarised by continent of origin.
#'
#' @format A data frame with 913 observations on the following 4 variables.
#' \describe{
Expand All @@ -28,6 +28,6 @@
#' \item{\code{continent_origin}}{Continent of residence of population.}
#' \item{\code{n}}{Number of people concerned.}
#' }
#' @source UNHCR (The UN Refugee Agency) (\url{http://popstats.unhcr.org/en/overview})
#' @source UNHCR (The UN Refugee Agency) (\url{https://www.unhcr.org/})
"unhcr_ts"

6 changes: 3 additions & 3 deletions R/format.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#'
#' @param format Format for numbers, currency, percentage, e.g. \code{".0\%"} for rounded percentage.
#' See online documentation : \url{https://github.com/d3/d3-format}.
#' @param prefix Character string to append before formatd value.
#' @param suffix Character string to append after formatd value.
#' @param locale Localization to use, for exemple \code{"fr-FR"} for french,
#' @param prefix Character string to append before formatted value.
#' @param suffix Character string to append after formatted value.
#' @param locale Localization to use, for example \code{"fr-FR"} for french,
#' see possible values here: \url{https://github.com/d3/d3-format/tree/master/locale}.
#'
#' @return a \code{JS} function
Expand Down
5 changes: 1 addition & 4 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@

0 errors | 0 warnings | 0 note

* This is a new release.

Update JavaScript library.
Fix issue with sizing in Shiny.
* New features and updated javascript dependencies

Thank you!

Expand Down
2 changes: 1 addition & 1 deletion man/ax_chart.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/format_num.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/unhcr_popstats_2017.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/unhcr_ts.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions vignettes/advanced-configuration.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Here some advanced configuration examples to use the full potential of [ApexChar
This example is taken from [{hrbrthemes}](https://github.com/hrbrmstr/hrbrthemes) readme, it use `mpg` dataset from [{ggplot2}](https://github.com/tidyverse/ggplot2).


Tranform data and initialize the chart :
Transform data and initialize the chart :

```{r}
data("mpg", package = "ggplot2")
Expand Down Expand Up @@ -155,9 +155,9 @@ count(mpg, class) %>%

# Lines

Dataset used is from the UNHCR (The UN Refugee Agency) and contains data about UNHCR's populations of concern summarised by continent of orginin.
Dataset used is from the UNHCR (The UN Refugee Agency) and contains data about UNHCR's populations of concern summarised by continent of origin.

Tranform data and initialize the chart :
Transform data and initialize the chart :

```{r}
data("unhcr_ts")
Expand Down Expand Up @@ -324,7 +324,7 @@ unhcr_ts %>%

Dataset used is from [{gapminder}](https://github.com/jennybc/gapminder).

Tranform data and initialize the chart :
Transform data and initialize the chart :

```{r}
data("gapminder", package = "gapminder")
Expand Down Expand Up @@ -368,7 +368,7 @@ scatter <- scatter %>%
)
```

Configuration for x-axis, hide the tooltip displayed on the axis itself (not the main tooltip), dispaly two decimals in the labels (useful when zooming, since values are logarithm there's a lot of decimals) :
Configuration for x-axis, hide the tooltip displayed on the axis itself (not the main tooltip), display two decimals in the labels (useful when zooming, since values are logarithm there's a lot of decimals) :

```{r}
scatter <- scatter %>%
Expand Down Expand Up @@ -404,7 +404,7 @@ scatter <- scatter %>%
ax_markers(hover = list(sizeOffset = 0, size = 25))
```

Add a custom tooltip with an HTML string, data used in aesthetic can be accessed in JavaScrip with `w.config.series[seriesIndex].data[dataPointIndex].x` (x is the variable `gdpPercap`), or `w.config.series[seriesIndex].data[dataPointIndex].label` (the country), it's possible to use custom aesthetics to include more data in the chart configuration script.
Add a custom tooltip with an HTML string, data used in aesthetic can be accessed in JavaScript with `w.config.series[seriesIndex].data[dataPointIndex].x` (x is the variable `gdpPercap`), or `w.config.series[seriesIndex].data[dataPointIndex].label` (the country), it's possible to use custom aesthetics to include more data in the chart configuration script.

```{r}
scatter <- scatter %>%
Expand Down Expand Up @@ -574,7 +574,7 @@ gapminder %>%

# Heatmap

This is an adaption of this fancy [{highcharter} example](http://jkunst.com/highcharter/showcase.html), based from this [WSJ visualisation](http://graphics.wsj.com/infectious-diseases-and-vaccines/).
This is an adaption of this fancy [{highcharter} example](http://jkunst.com/highcharter/showcase.html), based from this [WSJ visualization](http://graphics.wsj.com/infectious-diseases-and-vaccines/).


```{r}
Expand Down Expand Up @@ -683,7 +683,7 @@ heatmap <- heatmap %>%
)
```

Add a vertical line to identify the year when the vaccine was intrtoduced :
Add a vertical line to identify the year when the vaccine was introduced :

```{r}
heatmap <- heatmap %>%
Expand Down

0 comments on commit e0b6e28

Please sign in to comment.