More accurate check for palette names (#4093)

karawoo · web-flow · commit b4e3aeae772b · 2020-06-25T21:31:42.000-07:00
Some of the names can be NA if more colors are requested than are present in the
palette. is_named() would return FALSE in this case, so it's changed here to
`!is_null(names(pal))`.
diff --git a/R/scale-.r b/R/scale-.r
@@ -806,7 +806,7 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,
       self$n.breaks.cache <- n
     }
 
-    if (is_named(pal)) {
+    if (!is_null(names(pal))) {
       # if pal is named, limit the pal by the names first,
       # then limit the values by the pal
       idx_nomatch <- is.na(match(names(pal), limits))

Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,`
`806`	`806`	`self$n.breaks.cache <- n`
`807`	`807`	`}`
`808`	`808`
`809`		`- if (is_named(pal)) {`
	`809`	`+ if (!is_null(names(pal))) {`
`810`	`810`	`# if pal is named, limit the pal by the names first,`
`811`	`811`	`# then limit the values by the pal`
`812`	`812`	`idx_nomatch <- is.na(match(names(pal), limits))`