Merge scale calls

teunbrand · Sep 28, 2023 · 900a61a · 900a61a
1 parent a7b43b3
commit 900a61a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/R/scale-.R b/R/scale-.R
@@ -572,17 +572,25 @@ Scale <- ggproto("Scale", NULL,
     return()
   },
 
-  update_params = function(self, params, default = FALSE) {
+  update_params = function(self, params, default = FALSE, call = NULL) {
 
     fields <- intersect(self$fields, names(params))
     extra  <- setdiff(names(params), fields)
 
     if (length(extra) > 0) {
       cli::cli_warn(
-        "Ignoring unknown scale parameter{?s}: {.and {.field {extra}}}."
+        "Ignoring unknown scale parameter{?s}: {.and {.field {extra}}}.",
+        call = call
       )
     }
 
+    if (is.null(self$call)) {
+      self$call <- call
+    } else if (!is.null(call)) {
+      self$call <- call("+", self$call, call)
+    }
+    call <- self$call
+
     if (!default) {
       # Don't update fields that were already defined in non-default scale
       fields <- setdiff(fields, call_args_names(self$call))

diff --git a/R/scale-partial.R b/R/scale-partial.R
@@ -40,6 +40,12 @@ ScalePartial <- ggproto(
 
   update_params = function(self, params, default = FALSE, call = self$call) {
     self$params <- defaults(params, self$params)
+    if (is.null(self$call)) {
+      self$call <- call
+    } else if (!is.null(call)) {
+      self$call <- call("+", self$call, call)
+    }
+    return()
   },
 
   clone = function(self) {