verify_guides() should just populate sensible defaults, not override user specified values; fixes #1137; fixes #1112

Author: cpsievert

R/utils.R

@@ -822,10 +822,13 @@ verify_guides <- function(p) {
 
     idx <- which(isBar)
     for (i in seq_along(idx)) {
-      p <- colorbar_built(
-        p, which = i, len = 1 / nGuides, y = 1 - ((i - 1) / nGuides), 
-        lenmode = "fraction",  yanchor = "top"
-      )
+      # TODO: account for marker.line.colorbar
+      j <- idx[[i]]
+      bar <- p$x$data[[j]]$marker$colorbar
+      p$x$data[[j]]$marker$colorbar$len <- bar$len %||% (1 / nGuides)
+      p$x$data[[j]]$marker$colorbar$lenmode <- bar$lenmode %||% "fraction"
+      p$x$data[[j]]$marker$colorbar$y <- bar$y %||% (1 - ((i - 1) / nGuides))
+      p$x$data[[j]]$marker$colorbar$yanchor <- bar$yanchor %||% "top"
     }
 
   }

tests/testthat/test-plotly-colorbar.R

@@ -10,9 +10,9 @@ expect_traces <- function(p, n.traces, name){
 
 test_that("Can set colorbar attributes", {
   p <- plot_ly(mtcars, x = ~wt, y = ~cyl, color = ~cyl)
-  p <- colorbar(p, len = 0.5)
+  p <- colorbar(p, len = 0.3)
   l <- expect_traces(p, 2, "colorbar")
-  expect_equivalent(l$data[[2]]$marker$colorbar$len, 0.5)
+  expect_equivalent(l$data[[2]]$marker$colorbar$len, 0.3)
 })
 
 
@@ -43,6 +43,8 @@ test_that("Can expand z limits", {
   expect_equivalent(l$data[[1]]$zmax, 300)
 })
 
+
+# TODO: values outside the scale limits should probably be non-transparent (e.g. gray) 
 test_that("Can restrict z limits", {
   p <- plot_ly(z = ~volcano)
   p <- colorbar(p, limits = c(140, 160))
@@ -54,3 +56,40 @@ test_that("Can restrict z limits", {
   dim(v) <- dim(volcano)
   expect_equivalent(l$data[[1]][["z"]], v)
 })
+
+
+test_that("colorbar does not affect mode of other traces", {
+  # https://github.com/ropensci/plotly/issues/1196
+  p <- plot_ly() %>% 
+    add_markers(data = mtcars, x= ~ hp, y= ~mpg, color = ~wt) %>% 
+    add_lines(x = seq(100, 300, length.out = 20), y = seq(10, 30, length.out = 20),
+              color = I("black"))
+  
+  expect_true(hide_colorbar(p)$x$data[[1]]$mode == "markers")
+  expect_true(hide_colorbar(p)$x$data[[2]]$mode == "lines")
+  expect_true(colorbar(p, limits = c(1,10))$x$data[[1]]$mode == "markers")
+  expect_true(colorbar(p, limits = c(1,10))$x$data[[2]]$mode == "lines")
+  
+})
+
+
+test_that("can control both fill and stroke colorbars", {
+  
+  p <- plot_ly(mtcars, x = ~wt, y = ~cyl, color = ~cyl, stroke = ~wt) %>%
+    colorbar(title = "fill color", len = 0.4) %>%
+    colorbar(title = "stroke color", len = 0.6, y = 0.55, which = 2)
+  
+  d <- p$x$data
+  expect_length(d, 3)
+  
+  bar_fill <- d[[2]]$marker$colorbar
+  expect_true(bar_fill$len == 0.4)
+  expect_true(bar_fill$y == 1)
+  expect_true(bar_fill$title == "fill color")
+  
+  bar_stroke <- d[[3]]$marker$colorbar
+  expect_true(bar_stroke$len == 0.6)
+  expect_true(bar_stroke$y == 0.55)
+  expect_true(bar_stroke$title == "stroke color")
+  
+})