Merge branch 'master' into scattergl

Author: cpsievert

R/plotly_build.R

@@ -132,7 +132,7 @@ plotly_build.plotly <- function(p, registerFrames = TRUE) {
     )
 
     # attach crosstalk info, if necessary
-    if (crosstalk_key() %in% names(dat) && isTRUE(trace[["inherit"]])) {
+    if (crosstalk_key() %in% names(dat) && isTRUE(trace[["inherit"]] %||% TRUE)) {
       trace[["key"]] <- trace[["key"]] %||% dat[[crosstalk_key()]]
       trace[["set"]] <- trace[["set"]] %||% attr(dat, "set")
     }

tests/testthat/test-animate-highlight.R

@@ -24,8 +24,6 @@ test_that("SharedData produces key/set in ggplotly", {
   expect_false(tr$`_isSimpleKey` %||% FALSE)
 })
 
-
-
 test_that("crosstalk keys are inherited in a layer with inherit = FALSE", {
 
   p <- txhousing %>%
@@ -48,6 +46,22 @@ test_that("crosstalk keys are inherited in a layer with inherit = FALSE", {
   expect_true(b$x$data[[1]][["set"]] == "Select a city")
 })
 
+test_that("Simple scatterplot brushing with plot_ly() and subplot()", {
+  
+  p <- mtcars %>%
+    crosstalk::SharedData$new(group = "testing") %>%
+    plot_ly(x = ~mpg, y = ~wt)
+  
+  b <- subplot(p, p) %>% 
+    highlight("plotly_selected") %>%
+    plotly_build()
+  
+  expect_true(all(b$x$data[[1]]$key == row.names(mtcars)))
+  expect_true(all(b$x$data[[2]]$key == row.names(mtcars)))
+  expect_true(b$x$data[[1]]$set == "testing")
+  expect_true(b$x$layout$dragmode == "select")
+})
+
 
 
 # Ignore for now https://github.com/ggobi/ggally/issues/264