colorbar limits shouldn't control non-color-scale mapping

Author: cpsievert

R/helpers.R

@@ -61,15 +61,23 @@ colorbar_built <- function(p, ..., limits = NULL, which = 1) {
         p$x$data[[i]]$zmax <- limits[2]
       } else {
         # since the colorscale is in a different trace, retrain all traces
+        # TODO: without knowing which traces are tied to the colorscale,
+        # there are always going to be corner-cases where limits are applied 
+        # to more traces than it should
         p$x$data <- lapply(p$x$data, function(x) {
+          type <- x[["type"]] %||% "scatter"
           col <- x$marker[["color"]]
-          x$marker[["color"]][col < limits[1] | limits[2] < col] <- default(NA)
-          x$marker[["cmin"]] <- default(limits[1])
-          x$marker[["cmax"]] <- default(limits[2])
+          if (has_color_array(type, "marker") && is.numeric(col)) {
+            x$marker[["color"]][col < limits[1] | limits[2] < col] <- default(NA)
+            x$marker[["cmin"]] <- default(limits[1])
+            x$marker[["cmax"]] <- default(limits[2])
+          }
           col <- x$line[["color"]]
-          x$line[["color"]][col < limits[1] | limits[2] < col] <- default(NA)
-          x$line[["cmin"]] <- default(limits[1])
-          x$line[["cmax"]] <- default(limits[2])
+          if (has_color_array(type, "line") && is.numeric(col)) {
+            x$line[["color"]][col < limits[1] | limits[2] < col] <- default(NA)
+            x$line[["cmin"]] <- default(limits[1])
+            x$line[["cmax"]] <- default(limits[2])
+          }
           x
         })
       }

R/plotly_build.R

@@ -840,7 +840,6 @@ map_color <- function(traces, stroke = FALSE, title = "", colorway, na.color = "
         }
 
         # make sure the colorscale is going to convert to JSON nicely
-        # TODO: 
         traces[[i]]$marker$colorscale <- as_df(traces[[i]]$marker$colorscale)
       }
     }

tests/testthat/test-plotly-colorbar.R

@@ -176,3 +176,17 @@ test_that("Colorbar limits controls marker.color and line.color", {
   expect_true(b3$x$data[[1]]$line$cmin == 20)
   expect_true(b3$x$data[[1]]$line$cmax == 100)
 })
+
+test_that("colorbar limits shouldn't control non-color-scale mapping(s)", {
+  
+  p <- plot_ly(x = 1:10, y = 1:10, color = 1:10) %>% 
+    add_markers() %>% 
+    add_lines(x  = 1:3, y = 1:3, color = I('red')) %>% 
+    colorbar(limits = c(1, 5))
+  
+  b <- plotly_build(p)
+  expect_length(b$x$data, 3)
+  
+  expect_true(sum(is.na(b$x$data[[1]]$marker$color)) == 5)
+  expect_true(b$x$data[[2]]$line$color == toRGB("red"))
+})