store all ggplot2 layer info in attrs/visdat; only eval unevaluated attrs

Author: cpsievert

R/ggplotly.R

@@ -757,23 +757,33 @@ gg2list <- function(p, width = NULL, height = NULL, tooltip = "all",
   # returns list element with their 'AsIs' class,
   # which conflicts with our JSON unboxing strategy.
   l <- rm_asis(l)
-  l$cur_data <- new_id()
-  # translate "plot-wide" aesthetic mappings to formulas so plotly_build() 
-  # understands them
-  mappingFormulas <- if (originalData) {
-    lapply(plot$mapping, lazyeval::f_new)
-  } else {
-    nms <- names(plot$mapping)
-    setNames(lapply(nms, function(x) lazyeval::f_new(as.symbol(x))), nms)
-  }
-  dat <- if (originalData) plot$data else data[[layerData]]
-  if (!is.null(mappingFormulas[["group"]])) {
-    dat <- dplyr::group_by_(dat, mappingFormulas[["group"]])
-  }
+  
+  # start build a plotly object with meta information about the ggplot
+  ids <- lapply(seq_along(data), function(x) new_id())
+  l$cur_data <- ids[[layerData]]
+  l$visdat <- if (originalData) lapply(layer_data, function(x) function(y) x) else lapply(data, function(x) function(y) x)
+  l$visdat <- setNames(l$visdat, ids)
+  
+  # translate layer mappings -> plotly attrs
+  mappingFormulas <- lapply(layers, function(x) {
+    mappings <- c(x$mapping, if (isTRUE(x$inherit.aes)) plot$mapping)
+    if (originalData) {
+      lapply(mappings, lazyeval::f_new)
+    } else {
+      nms <- names(mappings)
+      setNames(lapply(nms, function(x) lazyeval::f_new(as.symbol(x))), nms)
+    }
+  })
+  #if (!is.null(mappingFormulas[["group"]])) {
+  #  dat <- dplyr::group_by_(dat, mappingFormulas[["group"]])
+  #}
   # don't need to add group as an attribute anymore
-  mappingFormulas <- mappingFormulas[!grepl("^group$", names(mappingFormulas))]
-  l$attrs <- setNames(list(mappingFormulas), l$cur_data)
-  l$visdat <- setNames(list(function() dat), l$cur_data)
+  # mappingFormulas <- mappingFormulas[!grepl("^group$", names(mappingFormulas))]
+  l$attrs <- setNames(mappingFormulas, ids)
+  l$attrs <- lapply(l$attrs, function(x) structure(x, class = "plotly_eval"))
+  # the build step remove the first attrs if no type exists
+  l$attrs[[1]][["type"]] <- "ggplotly"
+  
   l
 }
 

R/plotly_build.R

@@ -72,18 +72,22 @@ plotly_build.plotly <- function(p) {
   p$x$layout$annotations <- annotations
 
 
+  
+  
   # If type was not specified in plot_ly(), it doesn't create a trace unless
   # there are no other traces
-  if (is.null(p$x$attrs[[1]][["type"]])) {
-    if (length(p$x$attrs) > 1 || isTRUE(attr(p, "ggplotly"))) {
-      p$x$attrs[[1]] <- NULL
-    }
+  if (is.null(p$x$attrs[[1]][["type"]]) && length(p$x$attrs) > 1) {
+    p$x$attrs[[1]] <- NULL
   }
 
+  # have the attributes already been evaluated?
+  is.evaled <- function(x) inherits(x, "plotly_eval")
+  attrsToEval <- p$x$attrs[!vapply(p$x$attrs, is.evaled, logical(1))]
+  
   # trace type checking and renaming for plot objects
   if (is_mapbox(p) || is_geo(p)) {
     p <- geo2cartesian(p)
-    p$x$attrs <- lapply(p$x$attrs, function(tr) {
+    attrsToEval <- lapply(attrsToEval, function(tr) {
       if (!grepl("scatter|choropleth", tr[["type"]] %||% "scatter")) {
         stop("Cant add a '", tr[["type"]], "' trace to a map object", call. = FALSE)
       }
@@ -218,7 +222,9 @@ plotly_build.plotly <- function(p) {
     trace[c("ymin", "ymax", "yend", "xend")] <- NULL
     trace[lengths(trace) > 0]
 
-  }, p$x$attrs, names2(p$x$attrs))
+  }, attrsToEval, names2(attrsToEval))
+  
+  p$x$attrs <- lapply(p$x$attrs, function(x) structure(x, class = "plotly_eval"))
 
   # traceify by the interaction of discrete variables
   traces <- list()