Revert "Pass data to use_defaults() method (this way GeomSf default aes logic will actually work as expected)"

cpsievert · cpsievert · commit b7d38c03c28e · 2025-06-05T12:01:57.000-05:00
This reverts commit 01e73fb.
diff --git a/R/layers2traces.R b/R/layers2traces.R
@@ -1112,7 +1112,7 @@ aes2plotly <- function(data, params, aes = "size") {
       # ggfun() returns a function because ggplot2 now
       # defines data.frame in it's namespace
       # https://github.com/ropensci/plotly/pull/1481
-      if ("default_aes" %in% names(geom_obj)) geom_obj$use_defaults(data) else NULL
+      if ("default_aes" %in% names(geom_obj)) geom_obj$use_defaults(NULL) else NULL
     }
     vals <- defaults[[aes]]
   }

Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ aes2plotly <- function(data, params, aes = "size") {`
`1112`	`1112`	`# ggfun() returns a function because ggplot2 now`
`1113`	`1113`	`# defines data.frame in it's namespace`
`1114`	`1114`	`# https://github.com/ropensci/plotly/pull/1481`
`1115`		`- if ("default_aes" %in% names(geom_obj)) geom_obj$use_defaults(data) else NULL`
	`1115`	`+ if ("default_aes" %in% names(geom_obj)) geom_obj$use_defaults(NULL) else NULL`
`1116`	`1116`	`}`
`1117`	`1117`	`vals <- defaults[[aes]]`
`1118`	`1118`	`}`