Store group mappings as data attributes

Author: cpsievert

R/add.R

@@ -64,9 +64,9 @@ add_trace <- function(p, ...,
 
   p <- add_data(p, data)
 
-  # inherit attributes from the "first layer"
+  # inherit attributes from the "first layer" (except the plotly_eval class)
   if (inherit) {
-    attrs <- modify_list(p$x$attrs[[1]], attrs)
+    attrs <- modify_list(unclass(p$x$attrs[[1]]), attrs)
   }
 
   p$x$attrs <- c(

R/ggplotly.R

@@ -759,12 +759,7 @@ gg2list <- function(p, width = NULL, height = NULL, tooltip = "all",
   l <- rm_asis(l)
 
   # 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
+  # first, translate layer mappings -> plotly attrs
   mappingFormulas <- lapply(layers, function(x) {
     mappings <- c(x$mapping, if (isTRUE(x$inherit.aes)) plot$mapping)
     if (originalData) {
@@ -774,16 +769,27 @@ gg2list <- function(p, width = NULL, height = NULL, tooltip = "all",
       setNames(lapply(nms, function(x) lazyeval::f_new(as.symbol(x))), nms)
     }
   })
-  #if (!is.null(mappingFormulas[["group"]])) {
-  #  dat <- dplyr::group_by_(dat, mappingFormulas[["group"]])
-  #}
+  
+  return_dat <- if (originalData) layer_data else data
+  
+  # translate group aesthetics to data attributes
+  return_dat <- Map(function(x, y) {
+    if (is.null(y[["group"]])) return(x)
+    dplyr::group_by_(x, y[["group"]])
+  }, return_dat, mappingFormulas)
+  
   # don't need to add group as an attribute anymore
-  # mappingFormulas <- mappingFormulas[!grepl("^group$", names(mappingFormulas))]
+  mappingFormulas <- lapply(mappingFormulas, function(x) x[!grepl("^group$", names(x))])
+  
+  ids <- lapply(seq_along(data), function(x) new_id())
   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
+  # the build step removes the first attrs if no type exists
   l$attrs[[1]][["type"]] <- "ggplotly"
 
+  l$cur_data <- ids[[layerData]]
+  l$visdat <- setNames(lapply(return_dat, function(x) function(y) x), ids)
+  
   l
 }