be more careful when searching for defaults

Author: cpsievert

R/plotly_build.R

@@ -433,7 +433,8 @@ map_color <- function(traces, title = "", na.color = "transparent") {
   colorDefaults <- traceColorDefaults()
   for (i in which(isConstant)) {
     # https://github.com/plotly/plotly.js/blob/c83735/src/plots/plots.js#L58
-    idx <- i %% length(colorDefaults) + i %/% length(colorDefaults)
+    idx <- i %% length(colorDefaults)
+    if (idx == 0) idx <- 10
     col <- color[[i]] %||% colorDefaults[[idx]]
     alpha <- traces[[i]]$alpha %||% 1
     rgb <- toRGB(col, alpha)

R/subplots.R

@@ -342,10 +342,13 @@ retrain_color_defaults <- function(traces) {
   colorDefaults <- traceColorDefaults()
   for (i in seq_along(traces)) {
     # https://github.com/plotly/plotly.js/blob/c83735/src/plots/plots.js#L58
-    idx <- i %% length(colorDefaults) + i %/% length(colorDefaults)
+    idx <- i %% length(colorDefaults)
+    if (idx == 0) idx <- 10
     newDefault <- colorDefaults[[idx]]
     for (j in c("marker", "line", "text")) {
-      alpha <- attr(traces[[i]][[j]][["color"]], "defaultAlpha")
+      obj <- traces[[i]][[j]]
+      if (!"color" %in% names(obj)) next
+      alpha <- attr(obj[["color"]], "defaultAlpha")
       if (is.null(alpha)) next
       traces[[i]][[j]][["color"]] <- toRGB(colorDefaults[[idx]], alpha)
     }

tests/testthat/test-plotly.R

@@ -120,7 +120,7 @@ test_that("Alpha still applies when no color is applied", {
   p <- plot_ly(mtcars, x = ~mpg, y = ~disp, alpha = 0.5) 
   l <- expect_traces(p, 1, "alpha-no-color")
   # verify the correct alpha for the points
-  expect_equal(l$data[[1]]$marker$color, "rgba(31,119,180,0.5)")
+  expect_true(l$data[[1]]$marker$color == "rgba(31,119,180,0.5)")
 })