fix: add judgment on named vectors

tidyverse · Jul 25, 2023 · a1ef2ae · a1ef2ae
1 parent 23237d3
commit a1ef2ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/R/scale-manual.R b/R/scale-manual.R
@@ -180,7 +180,12 @@ manual_scale <- function(aesthetic, values = NULL, breaks = waiver(), ...,
     if (n > length(values)) {
       cli::cli_abort("Insufficient values in manual scale. {n} needed but only {length(values)} provided.")
     }
-    unname(values[seq_len(n)])
+
+    if (is.null(names(values))) {
+      values[seq_len(n)]
+    } else {
+      values
+    }
   }
   discrete_scale(aesthetic, "manual", pal, breaks = breaks, limits = limits, ...)
 }
diff --git a/tests/testthat/test-scale-manual.R b/tests/testthat/test-scale-manual.R
@@ -23,7 +23,7 @@ test_that("names of values used in manual scales", {
 
 test_that("obtain expected quantity values from manual scale", {
   for (aesthetics in .all_aesthetics) {
-    s <- scale_discrete_manual(aesthetics = aesthetics, values = c("8" = "c", "4" = "a", "6" = "b"))
+    s <- scale_discrete_manual(aesthetics = aesthetics, values = c("c", "a", "b"))
     expect_equal(s$palette(1), c("c"))
     expect_equal(s$palette(2), c("c", "a"))
     expect_equal(s$palette(3), c("c", "a", "b"))