merge with master

Author: cpsievert

NEWS.md

@@ -15,6 +15,8 @@
 
 * `subplot()` now bumps annotation `xref`/`yref` anchors correctly (#1181).
 * `subplot()` now accumulates images, repositions paper coordinates, and reanchors axis references (#1332).
+* Information emitted by in `event_data()` for heatmaps with atomic vectors for `x`/`y`/`z` is now correct (#1141).
+* Fixed issue where **dplyr** groups caused a problem in the ordering of data arrays passed to `marker` objects (#1351).
 * In some cases, a `ggplotly()` colorbar would cause issues with hover behavior, which is now fixed (#1381).  
 * Recursive attribute validation is now only performed on recursive objects (#1315).
 

R/plotly_build.R

@@ -131,28 +131,24 @@ plotly_build.plotly <- function(p, registerFrames = TRUE) {
       class = oldClass(x)
     )
 
+    # determine trace type (if not specified, can depend on the # of data points)
+    # note that this should also determine a sensible mode, if appropriate
+    trace <- verify_type(trace)
+    # verify orientation of boxes/bars
+    trace <- verify_orientation(trace)
+    
     # attach crosstalk info, if necessary
     if (crosstalk_key() %in% names(dat) && isTRUE(trace[["inherit"]] %||% TRUE)) {
       trace[["key"]] <- trace[["key"]] %||% dat[[crosstalk_key()]]
       trace[["set"]] <- trace[["set"]] %||% attr(dat, "set")
     }
 
     # if appropriate, tack on a group index
-    grps <- tryCatch(
-      as.character(dplyr::groups(dat)),
-      error = function(e) character(0)
-    )
-    
+    grps <- if (has_group(trace)) tryNULL(dplyr::group_vars(dat))
     if (length(grps) && any(lengths(trace) == NROW(dat))) {
       trace[[".plotlyGroupIndex"]] <- interaction(dat[, grps, drop = F])
     }
 
-    # determine trace type (if not specified, can depend on the # of data points)
-    # note that this should also determine a sensible mode, if appropriate
-    trace <- verify_type(trace)
-    # verify orientation of boxes/bars
-    trace <- verify_orientation(trace)
-    
     # add sensible axis names to layout
     for (i in c("x", "y", "z")) {
       nm <- paste0(i, "axis")

inst/htmlwidgets/plotly.js

@@ -243,13 +243,15 @@ HTMLWidgets.widget({
         var gd = document.getElementById(el.id);
         var trace = gd.data[pt.curveNumber];
 
-        // Add other attributes here, if desired
+        // Heatmap z event data should derive from _z calc attribute
+        // https://github.com/ropensci/plotly/issues/1141
+        var z = trace.type === "heatmap" ? "_z" : "z";
         if (!trace._isSimpleKey) {
-          var attrsToAttach = ["key", "z"];
+          var attrsToAttach = ["key", z];
         } else {
           // simple keys fire the whole key
           obj.key = trace.key;
-          var attrsToAttach = ["z"];
+          var attrsToAttach = [z];
         }
 
         for (var i = 0; i < attrsToAttach.length; i++) {

tests/figs/plotly-group/plotly-no-nas-for-irrelevant-group.svg

@@ -65,3 +65,22 @@ test_that("Groups are ignored if grouping is irrelevant for the geom", {
   expect_length(l$data[[1]][["x"]], 32)
   expect_length(l$data[[1]][["y"]], 32)
 })
+
+
+test_that("Ordering of marker.color should not change in a simple scatterplot", {
+  
+  # https://github.com/ropensci/plotly/issues/1351
+  l <- mtcars %>%
+    mutate(id = seq_len(nrow(.))) %>%
+    group_by(cyl) %>%
+    plot_ly(
+      x = ~mpg, y = ~wt, text = ~id,
+      marker = list(color = ~ifelse(id == 1, "black", "red")),
+      mode = "marker+text", textposition = "right"
+    ) %>%
+    expect_doppelganger_built("simple-scatter-marker-color-group")
+  
+  expect_true(
+    all(l$data[[1]]$marker$color == c("black", rep("red", 31)))
+  )
+})