code review

Author: cpsievert

R/ggplotly.R

@@ -419,8 +419,13 @@ gg2list <- function(p, width = NULL, height = NULL,
       suppressMessages(dplyr::left_join(x, y))
     }, data, nestedKeys, layers)
 
-    # return all the objects in this environmet 
-    mget(ls(environment()), inherits = FALSE)
+    structure(
+      list(
+        data = data, layout = layout, plot = plot, 
+        env = environment()
+      ), 
+      class = "ggplot_built"
+    )
   }
 
   # Allow thematic to add new defaults to the plot object based on it's theme
@@ -432,12 +437,8 @@ gg2list <- function(p, width = NULL, height = NULL,
   }
 
   # ggplotly_build() returns list of objects...make them known to gg2list() env
-  
-  env <- environment()
-  for (var in names(built)) {
-    assign(var, built[[var]], envir = env)
-  }
-  
+  attach(built$env, name = "ggplot_build_env")
+  on.exit(detach(name = "ggplot_build_env", character.only = TRUE), add = TRUE)
 
 
   # initiate plotly.js layout with some plot-wide theming stuff