Merge pull request #7 from tidyverse/master

sthagen · web-flow · commit 33771966ef9a · 2020-03-08T13:26:20.000+01:00
Use na.value in ScaleBinned$map() (tidyverse#3869)
diff --git a/R/scale-.r b/R/scale-.r
@@ -986,7 +986,8 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,
         self$palette.cache <- pal
       }
 
-      pal[x_binned]
+      scaled <- pal[x_binned]
+      ifelse(!is.na(scaled), scaled, self$na.value)
     }
   },
 

Original file line number	Diff line number	Diff line change
`@@ -986,7 +986,8 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,`
`986`	`986`	`self$palette.cache <- pal`
`987`	`987`	`}`
`988`	`988`
`989`		`- pal[x_binned]`
	`989`	`+ scaled <- pal[x_binned]`
	`990`	`+ ifelse(!is.na(scaled), scaled, self$na.value)`
`990`	`991`	`}`
`991`	`992`	`},`
`992`	`993`