Merge pull request #74 from larmarange/geom_impr

some cleaning of internal code

NAMESPACE

@@ -61,4 +61,3 @@ importFrom(lifecycle,deprecated)
 importFrom(scales,percent)
 importFrom(stats,weighted.mean)
 importFrom(stats,weights)
-importFrom(utils,modifyList)

R/geom_diverging.R

@@ -74,7 +74,8 @@ geom_diverging <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp
+    stat = StatPropCount,
+    ...
   )
 }
 
@@ -92,11 +93,8 @@ geom_likert <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp |>
-      .modify_default_aes(
-        x = after_stat(prop),
-        y = after_stat(prop)
-      )
+    stat = StatPropProp,
+    ...
   )
 }
 
@@ -114,11 +112,8 @@ geom_pyramid <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp |>
-      .modify_default_aes(
-        x = after_stat(prop),
-        y = after_stat(prop)
-      )
+    stat = StatPropProp,
+    ...
   )
 }
 
@@ -136,11 +131,8 @@ geom_diverging_text <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp |>
-      .modify_default_aes(
-        label = after_stat(count),
-        colour = after_scale(hex_bw(.data$fill))
-      )
+    stat = StatPropCount,
+    ...
   )
 }
 
@@ -158,13 +150,8 @@ geom_likert_text <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp |>
-      .modify_default_aes(
-        x = after_stat(prop),
-        y = after_stat(prop),
-        label = scales::percent(after_stat(prop), accuracy = 1),
-        colour = after_scale(hex_bw(.data$fill))
-      )
+    stat = StatPropProp,
+    ...
   )
 }
 
@@ -182,12 +169,7 @@ geom_pyramid_text <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp |>
-      .modify_default_aes(
-        x = after_stat(prop),
-        y = after_stat(prop),
-        label = scales::percent(after_stat(prop), accuracy = 1),
-        colour = after_scale(hex_bw(.data$fill))
-      )
+    stat = StatPropProp,
+    ...
   )
 }

R/ggstats-package.R

@@ -32,15 +32,3 @@ utils::globalVariables(c("prop", "count"))
     b
   }
 }
-
-# helper for changing default aes
-# @param Stat a ggproto stat
-# @param ... new default aes
-#' @importFrom utils modifyList
-.modify_default_aes <- function(Stat, ...) {
-  new_aes <- ggplot2::aes(...)
-  Stat$default_aes <- ggplot2::aes(
-    !!!utils::modifyList(StatProp$default_aes, new_aes)
-  )
-  Stat
-}

R/stat_prop.R

@@ -249,11 +249,8 @@ geom_prop_bar <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp |>
-      .modify_default_aes(
-        x = after_stat(prop),
-        y = after_stat(prop)
-      )
+    stat = StatPropProp,
+    ...
   )
 }
 
@@ -272,12 +269,35 @@ geom_prop_text <- function(mapping = NULL,
     position = position,
     complete = complete,
     default_by = default_by,
-    stat = StatProp |>
-      .modify_default_aes(
-        x = after_stat(prop),
-        y = after_stat(prop),
-        label = scales::percent(after_stat(prop), accuracy = .1),
-        colour = after_scale(hex_bw(.data$fill))
-      )
+    stat = StatPropProp,
+    ...
   )
 }
+
+# all defaults to after_stat(prop)
+StatPropProp <- ggplot2::ggproto(
+  "StatPropProp",
+  StatProp,
+  default_aes = utils::modifyList(
+    StatProp$default_aes,
+    ggplot2::aes(
+      x = after_stat(prop),
+      y = after_stat(prop),
+      label = scales::percent(after_stat(prop), accuracy = .1)
+    )
+  )
+)
+
+# all defaults to after_stat(count)
+StatPropCount <- ggplot2::ggproto(
+  "StatPropCount",
+  StatProp,
+  default_aes = utils::modifyList(
+    StatProp$default_aes,
+    ggplot2::aes(
+      x = after_stat(count),
+      y = after_stat(count),
+      label = after_stat(count)
+    )
+  )
+)