do a better job of labeling default values; fixes #1196

Author: cpsievert

R/helpers.R

@@ -63,9 +63,9 @@ colorbar_built <- function(p, ..., limits = NULL, which = 1) {
         # since the colorscale is in a different trace, retrain all traces
         p$x$data <- lapply(p$x$data, function(x) {
           col <- x$marker[["color"]]
-          x$marker[["color"]][col < limits[1] | limits[2] < col] <- NA
-          x$marker[["cmin"]] <- limits[1]
-          x$marker[["cmax"]] <- limits[2]
+          x$marker[["color"]][col < limits[1] | limits[2] < col] <- default(NA)
+          x$marker[["cmin"]] <- default(limits[1])
+          x$marker[["cmax"]] <- default(limits[2])
           x
         })
       }
@@ -110,10 +110,10 @@ hide_colorbar <- function(p) {
   for (i in seq_along(p$x$data)) {
     trace <- p$x$data[[i]]
     if (has_attr(trace$type, "showscale")) {
-      p$x$data[[i]]$showscale <- FALSE
+      p$x$data[[i]]$showscale <- default(FALSE)
     }
     if (has_attr(trace$type, "marker")) {
-      p$x$data[[i]]$marker$showscale <- FALSE
+      p$x$data[[i]]$marker$showscale <- default(FALSE)
     }
   }
   p

R/plotly_build.R

@@ -852,7 +852,7 @@ map_color <- function(traces, stroke = FALSE, title = "", colorway, na.color = "
 
     # add an "empty" trace with the colorbar
     colorObj$color <- rng
-    colorObj$showscale <- TRUE
+    colorObj$showscale <- default(TRUE)
     colorBarTrace <- list(
       x = range(unlist(lapply(traces, "[[", "x")), na.rm = TRUE),
       y = range(unlist(lapply(traces, "[[", "y")), na.rm = TRUE),