Update implementation given feedback

Author: dpseidel

R/geom-.r

@@ -106,15 +106,15 @@ Geom <- ggproto("Geom",
 
   setup_data = function(data, params) data,
 
-  # Combine data with defaults and set aesthetics from parameters
-  use_defaults = function(self, data, params = list(), theme) {
-
-    # evaluates defaults given plot theme
+  # evaluate defaults according to theme
+  eval_defaults = function(self, theme) {
     if (length(theme) == 0) theme <- theme_grey()
-    env <- new.env()
-    env$theme <- theme
-    defaults <- rlang::eval_tidy(self$default_aes, env)
 
+    lapply(self$default_aes, rlang::eval_tidy, data = list(theme = theme))
+  },
+
+  # Combine data with defaults and set aesthetics from parameters
+  use_defaults = function(self, data, defaults, params = list()) {
     # Fill in missing aesthetics with their defaults
     missing_aes <- setdiff(names(defaults), names(data))
 

R/guide-legend.r

@@ -264,7 +264,12 @@ guide_geom.legend <- function(guide, layers, default_mapping, theme) {
         n <- vapply(layer$aes_params, length, integer(1))
         params <- layer$aes_params[n == 1]
 
-        data <- layer$geom$use_defaults(guide$key[matched], params, theme)
+        defaults <- layer$geom$eval_defaults(theme - theme)
+        data <- layer$geom$use_defaults(
+          data = guide$key[matched],
+          defaults = defaults,
+          params = params
+        )
       } else {
         return(NULL)
       }
@@ -274,7 +279,11 @@ guide_geom.legend <- function(guide, layers, default_mapping, theme) {
         # Default is to exclude it
         return(NULL)
       } else {
-        data <- layer$geom$use_defaults(NULL, layer$aes_params)[rep(1, nrow(guide$key)), ]
+        defaults <- layer$geom$eval_defaults(theme = theme)
+        data <- layer$geom$use_defaults(data = NULL,
+          defaults = defaults,
+          params = layer$aes_params
+        )[rep(1, nrow(guide$key)), ]
       }
     }
 

R/layer.r

@@ -305,8 +305,11 @@ Layer <- ggproto("Layer", NULL,
   compute_geom_2 = function(self, data, plot) {
     if (empty(data)) return(data)
 
+    # evaluate defaults for theme
+    defaults <- self$geom$eval_defaults(theme = plot$theme)
+
     # Combine aesthetics, defaults, & params
-    self$geom$use_defaults(data, self$aes_params, plot$theme)
+    self$geom$use_defaults(data, defaults = defaults, params = self$aes_params)
   },
 
   finish_statistics = function(self, data) {