include scale transforms

Author: teunbrand

R/scales-.R

@@ -105,7 +105,8 @@ ScalesList <- ggproto("ScalesList", NULL,
       function(scale) scale$transform_df(df = df)
     ), recursive = FALSE)
 
-    data_frame0(!!!transformed, df[setdiff(names(df), names(transformed))])
+    df[names(transformed)] <- transformed
+    df
   },
 
   backtransform_df = function(self, df) {
@@ -140,10 +141,8 @@ ScalesList <- ggproto("ScalesList", NULL,
       }
     ), recursive = FALSE)
 
-    data_frame0(
-      !!!backtransformed,
-      df[setdiff(names(df), names(backtransformed))]
-    )
+    df[names(backtransformed)] <- backtransformed
+    df
   },
 
   # `aesthetics` is a list of aesthetic-variable mappings. The name of each

tests/testthat/test-layer.R

@@ -172,7 +172,8 @@ test_that("attributes on layer data are preserved", {
   })
   # At the end of plot building, we want to retrieve that metric
   ld <- layer_data(
-    ggplot(mpg, aes(drv, hwy, colour = factor(year))) + new + facet_grid(~year)
+    ggplot(mpg, aes(drv, hwy, colour = factor(year))) + new + facet_grid(~year) +
+      scale_y_sqrt()
   )
   expect_equal(attr(ld, "test"), "preserve me")
 })