get geom args: also retrieve stat args

dreamRs · Jan 10, 2025 · 6285253 · 6285253
1 parent d24d8e2
commit 6285253
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: esquisse
 Type: Package
 Title: Explore and Visualize Your Data Interactively
-Version: 2.0.1
+Version: 2.0.1.9000
 Authors@R: c(person("Fanny", "Meyer", role = c("aut")),
   person("Victor", "Perrier", email = "[email protected]", role = c("aut", "cre")),
   person("Ian", "Carroll", comment = "Faceting support", role = "ctb"),

diff --git a/R/geometries.R b/R/geometries.R
@@ -233,6 +233,14 @@ match_geom_args <- function(geom,
     if (!inherits(stat_args, "try-error")) {
       geom_args <- c(geom_args, stat_args)
     }
+  } else if (!is.null(geom_args$stat)) {
+    stat_args <- try(
+      formals(fun = get(paste0("stat_", geom_args$stat), envir = pkg_envir)),
+      silent = TRUE
+    )
+    if (!inherits(stat_args, "try-error")) {
+      geom_args <- c(geom_args, stat_args)
+    }
   }
   # browser()
   if (isTRUE(add_aes)) {

diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
diff --git a/tests/testthat/test-geoms.R b/tests/testthat/test-geoms.R
@@ -24,7 +24,7 @@ test_that("match_geom_args works", {
   histo_params <- match_geom_args(geom = "histogram", args = params, add_aes = FALSE)
   expect_length(histo_params, 2)
   histo_params <- match_geom_args(geom = "violin", args = params)
-  expect_length(histo_params, 3)
+  expect_length(histo_params, 4)
 })