fixed bug with n_geoms different between ui and server

DESCRIPTION

@@ -16,7 +16,7 @@ URL: https://dreamrs.github.io/esquisse/, https://github.com/dreamRs/esquisse
 BugReports: https://github.com/dreamRs/esquisse/issues
 License: GPL-3 | file LICENSE
 Encoding: UTF-8
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
 Imports: 
     bslib,

R/esquisse-server.R

@@ -198,11 +198,9 @@ esquisse_server <- function(id,
           geoms <- potential_geoms(data_chart$data, mapping)
           req(geom %in% geoms)
 
-
           if (isTruthy(setdiff(geoms_others_r(), "blank"))) {
             geom <- c(geom, geoms_others_r())
             mappings <- c(list(mapping), aes_others_r())
-            # browser()
             geom_args <- lapply(
               X = seq_len(n_geoms), # n_geoms
               FUN = function(i) {

R/esquisse-ui.R

@@ -121,7 +121,8 @@ esquisse_ui <- function(id,
           id = ns("controls"),
           insert_code = insert_code,
           controls = controls,
-          downloads = downloads
+          downloads = downloads,
+          n_geoms = n_geoms
         )
       )
     } else {
@@ -140,7 +141,8 @@ esquisse_ui <- function(id,
             insert_code = insert_code,
             controls = controls,
             layout = "accordion",
-            downloads = downloads
+            downloads = downloads,
+            n_geoms = n_geoms
           )
         ),
 
@@ -181,7 +183,7 @@ esquisse_ui <- function(id,
 }
 
 #' @param width,height The width and height of the container, e.g. `"400px"`,
-#'  or `"100%"`; see \code{\link[htmltools]{validateCssUnit}}.
+#'  or `"100%"`; see [htmltools::validateCssUnit()].
 #' @param fixed Use a fixed container, e.g. to use use esquisse full page.
 #'  If `TRUE`, width and height are ignored. Default to `FALSE`.
 #'  It's possible to use a vector of CSS unit of length 4 to specify the margins

R/module-controls-geoms.R

@@ -252,8 +252,8 @@ controls_geoms_server <- function(id,
         aesthetics <- names(aesthetics_r())
 
         dropNulls(list(
-          stat = if (geom == "bar" & "yvar" %in% aesthetics) "summary",
-          fun = if (geom == "bar" & "yvar" %in% aesthetics) input$stat_fun,
+          stat = if (identical(geom, "bar") & isTRUE("yvar" %in% aesthetics)) "summary",
+          fun = if (identical(geom, "bar") & isTRUE("yvar" %in% aesthetics)) input$stat_fun,
           adjust = input$adjust,
           position = if (
             !identical(input$position, "stack") &

R/module-controls.R

@@ -58,7 +58,8 @@ controls_ui <- function(id,
                         controls = c("options", "labs", "axes", "geoms", "theme", "filters", "code"),
                         insert_code = FALSE,
                         layout = c("dropdown", "accordion"),
-                        downloads = downloads_labels()) {
+                        downloads = downloads_labels(),
+                        n_geoms = 1) {
   ns <- NS(id)
   layout <- match.arg(layout)
   if (!is.null(controls)) {
@@ -148,7 +149,7 @@ controls_ui <- function(id,
             padding = "5px 7px"
           )
         },
-        n_geoms = 5
+        n_geoms = n_geoms
       ),
       inputId = ns("controls-geoms"),
       class = "esquisse-controls-geoms",
@@ -242,11 +243,15 @@ controls_ui <- function(id,
 #' Dropup buttons to hide chart's controls
 #'
 #' @param id Module's ID.
-#' @param type \code{reactiveValues} indicating the type of chart.
-#' @param data_r \code{reactive} function returning data used in plot.
-#' @param data_name \code{reactive} function returning data name.
-#' @param ggplot_rv \code{reactiveValues} with ggplot object (for export).
-#' @param aesthetics \code{reactive} function returning aesthetic names used.
+#' @param data_r `reactive` function returning data used in plot.
+#' @param data_name `reactive` function returning data name.
+#' @param ggplot_rv `reactiveValues` with ggplot object (for export).
+#' @param aesthetics_r `reactive` function returning aesthetic names used.
+#' @param geoms_r `reactive` function returning geoms selected.
+#' @param active_geom_r `reactive` function returning the current geom.
+#' @param n_geoms Number of geoms possible.
+#' @param width,height Width and height of the chart.
+#' @param drop_ids Drop or not IDs in filter module.
 #'
 #' @return A reactiveValues with all input's values
 #' @noRd