more careful coercion of bare list of length 2

Author: cpsievert

R/utils.R

@@ -661,7 +661,7 @@ verify_colorscale <- function(p) {
 
 # Coerce `x` into a data structure that can map to a colorscale attribute.
 # Note that colorscales can either be the name of a scale (e.g., 'Rainbow') or 
-# a 2D array (e.g., [[0, 'rgb(0,0,255)', [1, 'rgb(255,0,0)']])
+# a 2D array (e.g., [[0, 'rgb(0,0,255)'], [1, 'rgb(255,0,0)']])
 colorscale_json <- function(x) {
   if (!length(x)) return(x)
   if (is.character(x)) return(x)
@@ -671,11 +671,25 @@ colorscale_json <- function(x) {
     x[, 1] <- as.numeric(x[, 1])
   }
   if (is.list(x) && length(x) == 2) {
-    x <- setNames(as.data.frame(x), NULL)
+    # ensure a list like this: list(list(0, 0.5, 1), list("red", "white", "blue"))
+    # converts to the correct dimensions
+    if (!is.data.frame(x) && can_be_numeric(x[[1]])) {
+      x <- data.frame(
+        val = as.numeric(x[[1]]),
+        col = as.character(x[[2]]),
+        stringsAsFactors = FALSE
+      )
+    }
+    x <- setNames(x, NULL)
   }
   x
 }
 
+can_be_numeric <- function(x) {
+  x <- suppressWarnings(as.numeric(x))
+  sum(is.na(x)) == 0
+}
+
 # if an object (e.g. trace.marker) contains a non-default attribute, it has been user-specified
 user_specified <- function(obj = NULL) {
   if (!length(obj)) return(FALSE)

tests/testthat/test-plotly-colorscale.R

@@ -39,7 +39,7 @@ test_that("Can specify contour colorscale", {
       y = 1:10, 
       marker = list(
         color = 1:10, 
-        colorscale = colorScale, 
+        colorscale = colorscale, 
         showscale = TRUE
       )
     )
@@ -53,22 +53,15 @@ test_that("Can specify contour colorscale", {
   test_df     <- plot_colorscale(as.data.frame(colorScale))
   test_matrix <- plot_colorscale(as.matrix(as.data.frame(colorScale)))
 
-})
-
-
-
-test_that("marker.colorscale overrides color", {
-  plot_ly(
-    x = c(-9, -6, -5, -3, -1), 
-    y = c(0, 1, 4, 5, 7), 
-    color = 1:5,
-    marker = list(
-      #color = 6:10, 
-      colorscale='Rainbow', 
-      showscale = TRUE
-    )
-  ) 
-  l <- expect_doppelganger_built(p, "marker.colorscale")
+  expect_doppelganger_built(test_list, "test_list")
+  expect_doppelganger_built(test_df, "test_df")
+  expect_doppelganger_built(test_matrix, "test_matrix")
+  
+  test_list_2 <- plot_colorscale(list(list(0, "rgb(0,0,255)"), list(1, "rgb(0,255,0)")))
+  test_list_3 <- plot_colorscale(list(list(0, 1), list("rgb(0,0,255)", "rgb(0,255,0)")))
+  
+  expect_doppelganger_built(test_list_2, "test_list_2")
+  expect_doppelganger_built(test_list_3, "test_list_3")
 })