guides deal with NA-breaks better

Author: teunbrand

R/guide-bins.R

@@ -154,6 +154,8 @@ GuideBins <- ggproto(
     key$.show  <- NA
 
     labels <- scale$get_labels(breaks)
+    labels <- labels[!is.na(breaks)]
+    breaks <- breaks[!is.na(breaks)]
     if (is.character(scale$labels) || is.numeric(scale$labels)) {
       limit_lab <- c(NA, NA)
     } else {

R/guide-colorsteps.R

@@ -110,11 +110,13 @@ GuideColoursteps <- ggproto(
 
     key <- data_frame0(!!aesthetic := scale$map(breaks))
     if (even.steps) {
-      key$.value <- seq_along(breaks)
+      key$.value <- NA_integer_
+      key$.value[!is.na(breaks)] <- seq_along(breaks[!is.na(breaks)])
     } else {
       key$.value <- breaks
     }
     key$.label <- scale$get_labels(breaks)
+    key <- vec_slice(key, !is.na(breaks))
 
     if (breaks[1] %in% limits) {
       key$.value  <- key$.value - 1L