Fix linetype regression (#6097)

* don't set `na.value = "blank"` * add test
tidyverse · Sep 16, 2024 · 842e6be · 842e6be
1 parent d742881
commit 842e6be
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/R/scale-linetype.R b/R/scale-linetype.R
@@ -35,7 +35,7 @@
 #'   scale_linetype_identity() +
 #'   facet_grid(linetype ~ .) +
 #'   theme_void(20)
-scale_linetype <- function(name = waiver(), ..., na.value = "blank") {
+scale_linetype <- function(name = waiver(), ..., na.value = NA) {
   discrete_scale(
     "linetype", name = name,
     palette = pal_linetype(),
@@ -46,7 +46,7 @@ scale_linetype <- function(name = waiver(), ..., na.value = "blank") {
 
 #' @rdname scale_linetype
 #' @export
-scale_linetype_binned <- function(name = waiver(), ..., na.value = "blank") {
+scale_linetype_binned <- function(name = waiver(), ..., na.value = NA) {
   binned_scale(
     "linetype", name = name,
     palette = pal_binned(pal_linetype()),

diff --git a/R/scale-manual.R b/R/scale-manual.R
@@ -119,7 +119,7 @@ scale_shape_manual <- function(..., values, breaks = waiver(), na.value = NA) {
 #' @seealso
 #' Other linetype scales: [scale_linetype()], [scale_linetype_identity()].
 #' @export
-scale_linetype_manual <- function(..., values, breaks = waiver(), na.value = "blank") {
+scale_linetype_manual <- function(..., values, breaks = waiver(), na.value = NA) {
   manual_scale("linetype", values, breaks, ..., na.value = na.value)
 }
 

diff --git a/man/scale_linetype.Rd b/man/scale_linetype.Rd
diff --git a/man/scale_manual.Rd b/man/scale_manual.Rd
diff --git a/tests/testthat/test-scale-manual.R b/tests/testthat/test-scale-manual.R
@@ -176,3 +176,10 @@ test_that("NAs from palette are not translated (#5929)", {
   s3$train(c("8", "6", "4"))
   expect_equal(s3$map(c("4", "6", "8", "10")), c("a", NA, "c", NA))
 })
+
+test_that("numeric linetype palettes are mapped correctly (#6096)", {
+  x  <- c(LETTERS[1:3], NA)
+  sc <- scale_linetype_manual(values = 1:5)
+  sc$train(x)
+  expect_equal(sc$map(x), c(1L, 2L, 3L, NA))
+})