require z attr in heatmaps

Author: cpsievert

R/add.R

@@ -409,9 +409,7 @@ add_heatmap <- function(p, x = NULL, y = NULL, z = NULL, ...,
     z <- z %||% p$x$attrs[[1]][["z"]]
   }
   if (is.null(z)) {
-    if (is.null(x) || is.null(y)) {
-      stop("Must supply both `x` and `y` attributes if `z` is NULL", call. = FALSE)
-    }
+    stop("Must supply `z` attribute", call. = FALSE)
   }
   add_trace_classed(
     p, class = "plotly_heatmap", z = z,

R/plotly_build.R

@@ -441,6 +441,7 @@ map_color <- function(traces, title = "", na.color = "transparent") {
     # we need some way to identify pre-specified defaults in subplot to retrain them
     if (is.null(color[[i]])) attr(rgb, "defaultAlpha") <- alpha
     obj <- if (hasLine[[i]]) "line" else if (hasMarker[[i]]) "marker" else if (hasText[[i]]) "textfont"
+    if (is.null(obj)) next
     traces[[i]][[obj]] <- modify_list(list(color = rgb), traces[[i]][[obj]])
     traces[[i]][[obj]] <- modify_list(list(fillcolor = rgb), traces[[i]][[obj]])
   }