From 901e67494d275cc27ca9f9a5a8ac9a41cf12842b Mon Sep 17 00:00:00 2001
From: pvictor <perrier.victor@gmail.com>
Date: Thu, 31 Dec 2020 09:46:32 +0100
Subject: [PATCH] compute count if no y aesthetic

---
 R/apex.R                 | 28 +++++++++++++++++++++++++++-
 examples/compute-count.R | 21 +++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 examples/compute-count.R

diff --git a/R/apex.R b/R/apex.R
index 7594a2a..0d1c16c 100644
--- a/R/apex.R
+++ b/R/apex.R
@@ -62,11 +62,16 @@ apex <- function(data, mapping, type = "column", ...,
   data <- as.data.frame(data)
   if (identical(type, "heatmap")) {
     mapping <- rename_aes_heatmap(mapping)
+  } else {
+    mapping <- rename_aes(mapping)
   }
   if (identical(type, "scatter") & is_sized(mapping)) {
     type <- "bubble"
   }
   mapdata <- lapply(mapping, rlang::eval_tidy, data = data)
+  if (is.null(mapdata$y) & !type %in% c("candlestick", "timeline", "heatmap")) {
+    mapdata <- compute_count(mapdata)
+  }
   if (type %in% c("pie", "donut", "radialBar", "polarArea")) {
     opts <- list(
       chart = list(type = correct_type(type)),
@@ -144,7 +149,7 @@ make_series <- function(mapdata, mapping, type = NULL, serie_name = NULL, force_
       add_names <- force_datetime_names
       x_order <- sort(x_order)
     } else {
-      add_names <- names(mapping)
+      add_names <- names(mapdata)
     }
     if (is.null(serie_name) & !is.null(mapping$y))
       serie_name <- rlang::as_label(mapping$y)
@@ -267,6 +272,27 @@ range_num <- function(x) {
 }
 
 
+compute_count <- function(mapdata) {
+  if (!is_grouped(mapdata)) {
+    x <- mapdata$x
+    weight <- mapdata$weight %||% rep(1, length(x))
+    count <- tapply(weight, x, sum, na.rm = TRUE, simplify = FALSE)
+    mapdata$x <- names(count)
+    mapdata$y <- as.numeric(count)
+  } else {
+    weight <- mapdata$weight %||% rep(1, length(mapdata$x))
+    count <- tapply(weight, mapdata[c("x", "group")], sum, na.rm = TRUE, simplify = FALSE)
+    mapdata$x <- rep(rownames(count), ncol(count))
+    mapdata$y <- unlist(count, use.names = FALSE)
+    mapdata$group <- rep(colnames(count), each = nrow(count))
+  }
+  mapdata$y[is.na(mapdata$y)] <- 0
+  return(mapdata)
+}
+
+
+
+# Configs ----
 
 
 # Switch between auto configs according to type & mapping
diff --git a/examples/compute-count.R b/examples/compute-count.R
new file mode 100644
index 0000000..e390878
--- /dev/null
+++ b/examples/compute-count.R
@@ -0,0 +1,21 @@
+library(apexcharter)
+
+data("mpg", package = "ggplot2")
+
+### No grouping
+
+# Both charts should be equivalent
+n_manufac <- dplyr::count(mpg, manufacturer)
+apex(data = n_manufac, type = "column", mapping = aes(x = manufacturer, y = n))
+
+apex(data = mpg, type = "column", mapping = aes(x = manufacturer))
+
+
+### With groups
+
+# Both charts should be equivalent
+n_manufac_year <- dplyr::count(mpg, manufacturer, year)
+apex(data = n_manufac_year, type = "column", mapping = aes(x = manufacturer, y = n, fill = year))
+
+apex(data = mpg, type = "column", mapping = aes(x = manufacturer, fill = year))
+