updated slope chart height

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: apexcharter
-Version: 0.4.1.9300
+Version: 0.4.1.9400
 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.

NEWS.md

@@ -1,7 +1,7 @@
 apexcharter 0.4.2
 ==================
 
-* Updated ApexCharts.js to 3.48.0 (see https://github.com/apexcharts/apexcharts.js/releases).
+* Updated ApexCharts.js to 3.49.1 (see https://github.com/apexcharts/apexcharts.js/releases).
 
 
 

R/apex.R

@@ -14,7 +14,7 @@
 #'  `"pie"`, `"donut"`,
 #'  `"radialBar"`, `"radar"`, `"scatter"`,
 #'  `"heatmap"`, `"treemap"`,
-#'  `"timeline"` and `"dumbbell"`.
+#'  `"timeline"`, `"dumbbell"` and `"slope"`.
 #' @param ... Other arguments passed on to methods. Not currently used.
 #' @param synchronize Give a common id to charts to synchronize them (tooltip and zoom).
 #' @param serie_name Name for the serie displayed in tooltip,
@@ -44,7 +44,7 @@ apex <- function(data, mapping,
     choices = c(
       "column", "bar",
       "rangeBar", "dumbbell",
-      "line", "spline", "step",
+      "line", "spline", "step", "slope",
       "area", "area-spline", "area-step",
       "rangeArea",
       "pie", "donut",
@@ -69,7 +69,7 @@ apex <- function(data, mapping,
     type <- "bubble"
   }
   mapdata <- lapply(mapping, rlang::eval_tidy, data = data)
-  type_no_compute <- c("candlestick", "boxplot", "timeline", "heatmap", "rangeArea", "rangeBar", "dumbbell")
+  type_no_compute <- c("candlestick", "boxplot", "timeline", "heatmap", "rangeArea", "rangeBar", "dumbbell", "slope")
   if (is.null(mapdata$y) & !type %in% type_no_compute) {
     mapdata <- compute_count(mapdata)
   }
@@ -179,7 +179,7 @@ make_series <- function(mapdata, mapping, type = NULL, serie_name = NULL, force_
     )))
     if (is_grouped(mapping)) {
       mapdata <- rename_aes(mapdata)
-      len_grp <- tapply(mapdata$group, mapdata$group, length)
+      len_grp <- tapply(as.character(mapdata$group), as.character(mapdata$group), length)
       if (length(unique(len_grp)) > 1 & !isTRUE(type %in% c("scatter", "bubble"))) {
         warning("apex: all groups must have same length! You can use `tidyr::complete` for this.")
       }
@@ -258,7 +258,7 @@ list1 <- function(x) {
 correct_type <- function(type) {
   if (isTRUE(type %in% c("column"))) {
     "bar"
-  } else if (isTRUE(type %in% c("spline", "step"))) {
+  } else if (isTRUE(type %in% c("spline", "step", "slope"))) {
     "line"
   } else if (isTRUE(type %in% c("area-spline", "area-step"))) {
     "area"
@@ -344,6 +344,7 @@ choose_config <- function(type, mapdata) {
     "timeline" = config_timeline(),
     "candlestick" = config_candlestick(),
     "boxplot" = config_boxplot(horizontal = box_horiz),
+    "slope" = config_slope(),
     list()
   )
 }
@@ -464,3 +465,12 @@ config_boxplot <- function(horizontal = FALSE) {
   )
 }
 
+config_slope <- function() {
+  list(
+    plotOptions = list(
+      line = list(
+        isSlopeChart = TRUE
+      )
+    )
+  )
+}

R/data.R

@@ -89,3 +89,12 @@
 #' @source gapminder package (\url{https://jennybc.github.io/gapminder/} and \url{https://www.gapminder.org/data/})
 "life_expec"
 
+#' @title Life expectancy  data (long format)
+#'
+#' @description The dataset contains data about life expectancy in 1972 and 2007 for 10 countries.
+#'
+#' @format A data frame with 20 observations and 3 variables.
+#'
+#' @source gapminder package (\url{https://jennybc.github.io/gapminder/} and \url{https://www.gapminder.org/data/})
+"life_expec_long"
+

data-raw/life_expectancy.R

@@ -9,13 +9,14 @@ library(gapminder)
 
 # Data --------------------------------------------------------------------
 
-life_expec <- as.data.table(gapminder::gapminder)
-life_expec <- life_expec[year %in% c(1972, 2007), list(country, year, lifeExp)]
+life_expec_long <- as.data.table(gapminder::gapminder)
+life_expec_long <- life_expec_long[year %in% c(1972, 2007), list(country, year, lifeExp)]
 
 # life_expec <- life_expec[country %in% sample(unique(country), 10)]
-life_expec <- life_expec[country %in% c("Botswana", "Ghana", "Iran", "Liberia", "Malaysia", "Mexico", 
+life_expec_long <- life_expec_long[country %in% c("Botswana", "Ghana", "Iran", "Liberia", "Malaysia", "Mexico",
                                         "Nigeria", "Pakistan", "Philippines", "Zambia")]
-life_expec <- dcast(life_expec, country ~ year, value.var = "lifeExp")
+life_expec_long[, country := as.character(country)]
+life_expec <- dcast(life_expec_long, country ~ year, value.var = "lifeExp")
 life_expec[, type := fifelse(`1972` > `2007`, "decreased", "increased")]
 
 
@@ -25,6 +26,8 @@ life_expec[, type := fifelse(`1972` > `2007`, "decreased", "increased")]
 setDF(life_expec)
 usethis::use_data(life_expec, internal = FALSE, overwrite = TRUE, compress = "xz")
 
+setDF(life_expec_long)
+usethis::use_data(life_expec_long, internal = FALSE, overwrite = TRUE, compress = "xz")
 
 
 
@@ -34,13 +37,13 @@ usethis::use_data(life_expec, internal = FALSE, overwrite = TRUE, compress = "xz
 
 pkgload::load_all()
 
-apex(life_expec, aes(country, x = `1972`, xend = `2007`), type = "dumbbell") %>% 
+apex(life_expec, aes(country, x = `1972`, xend = `2007`), type = "dumbbell") %>%
   ax_plotOptions(
     bar = bar_opts(
       dumbbellColors = list(list("#3d85c6", "#fb6003"))
     )
-  ) %>% 
-  ax_colors("#BABABA") %>% 
+  ) %>%
+  ax_colors("#BABABA") %>%
   ax_labs(
     title = "Life expectancy : 1972 vs. 2007",
     subtitle = "Data from Gapminder dataset",
@@ -49,14 +52,14 @@ apex(life_expec, aes(country, x = `1972`, xend = `2007`), type = "dumbbell") %>%
 
 
 
-apex(life_expec, aes(country, x = `1972`, xend = `2007`, group = type), type = "dumbbell") %>% 
+apex(life_expec, aes(country, x = `1972`, xend = `2007`, group = type), type = "dumbbell") %>%
   ax_xaxis(type = "category", categories = unique(life_expec$country)) %>%
   ax_plotOptions(
     bar = bar_opts(
       dumbbellColors = list(list("#3d85c6", "#fb6003"), list("#3d85c6", "#fb6003"))
     )
-  ) %>% 
-  ax_colors(c("#3d85c6", "#fb6003")) %>% 
+  ) %>%
+  ax_colors(c("#3d85c6", "#fb6003")) %>%
   ax_labs(
     title = "Life expectancy : 1972 vs. 2007",
     subtitle = "Data from Gapminder dataset",

inst/htmlwidgets/apexcharter.js.LICENSE.txt

@@ -1,5 +1,5 @@
 /*!
- * ApexCharts v3.48.0
+ * ApexCharts v3.49.1
  * (c) 2018-2024 ApexCharts
  * Released under the MIT License.
  */

man/apex.Rd

@@ -30,7 +30,7 @@ a \code{data.frame}, it will be coerced to with \code{as.data.frame}.}
 \code{"pie"}, \code{"donut"},
 \code{"radialBar"}, \code{"radar"}, \code{"scatter"},
 \code{"heatmap"}, \code{"treemap"},
-\code{"timeline"} and \code{"dumbbell"}.}
+\code{"timeline"}, \code{"dumbbell"} and \code{"slope"}.}
 
 \item{...}{Other arguments passed on to methods. Not currently used.}
 

man/life_expec_long.Rd

@@ -0,0 +1,19 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/data.R
+\docType{data}
+\name{life_expec_long}
+\alias{life_expec_long}
+\title{Life expectancy  data (long format)}
+\format{
+A data frame with 20 observations and 3 variables.
+}
+\source{
+gapminder package (\url{https://jennybc.github.io/gapminder/} and \url{https://www.gapminder.org/data/})
+}
+\usage{
+life_expec_long
+}
+\description{
+The dataset contains data about life expectancy in 1972 and 2007 for 10 countries.
+}
+\keyword{datasets}

package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "apexcharts": "^3.48.0",
+        "apexcharts": "^3.49.1",
         "d3-format": "^3.0.1"
       },
       "devDependencies": {
@@ -371,9 +371,9 @@
       }
     },
     "node_modules/apexcharts": {
-      "version": "3.48.0",
-      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.48.0.tgz",
-      "integrity": "sha512-Lhpj1Ij6lKlrUke8gf+P+SE6uGUn+Pe1TnCJ+zqrY0YMvbqM3LMb1lY+eybbTczUyk0RmMZomlTa2NgX2EUs4Q==",
+      "version": "3.49.1",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.49.1.tgz",
+      "integrity": "sha512-MqGtlq/KQuO8j0BBsUJYlRG8VBctKwYdwuBtajHgHTmSgUU3Oai+8oYN/rKCXwXzrUlYA+GiMgotAIbXY2BCGw==",
       "dependencies": {
         "@yr/monotone-cubic-spline": "^1.0.3",
         "svg.draggable.js": "^2.2.2",
@@ -2030,9 +2030,9 @@
       "requires": {}
     },
     "apexcharts": {
-      "version": "3.48.0",
-      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.48.0.tgz",
-      "integrity": "sha512-Lhpj1Ij6lKlrUke8gf+P+SE6uGUn+Pe1TnCJ+zqrY0YMvbqM3LMb1lY+eybbTczUyk0RmMZomlTa2NgX2EUs4Q==",
+      "version": "3.49.1",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.49.1.tgz",
+      "integrity": "sha512-MqGtlq/KQuO8j0BBsUJYlRG8VBctKwYdwuBtajHgHTmSgUU3Oai+8oYN/rKCXwXzrUlYA+GiMgotAIbXY2BCGw==",
       "requires": {
         "@yr/monotone-cubic-spline": "^1.0.3",
         "svg.draggable.js": "^2.2.2",

package.json

@@ -35,7 +35,7 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "apexcharts": "^3.48.0",
+    "apexcharts": "^3.49.1",
     "d3-format": "^3.0.1"
   }
 }

vignettes/apexcharter.Rmd

@@ -336,3 +336,27 @@ apex(life_expec, aes(country, x = `1972`, xend = `2007`), type = "dumbbell") %>%
   )
 ```
 
+
+
+## Slope charts
+
+Create a slope chart with:
+
+```{r slope}
+data("life_expec_long", package = "apexcharter")
+
+apex(
+  life_expec_long,
+  mapping = aes(x = as.character(year), y = lifeExp, fill = country),
+  type = "slope",
+  height = "700px"
+) %>% 
+  ax_colors("#112466") %>% 
+  ax_labs(
+    title = "Life expectancy : 1972 vs. 2007",
+    subtitle = "Data from Gapminder dataset",
+    x = "Life expectancy at birth, in years"
+  )
+```
+
+