fix: obtain expected quantity values from manual scale

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

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/R/scale-manual.R b/R/scale-manual.R
@@ -180,7 +180,7 @@ 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.")
     }
-    values
+    unname(values[seq_len(n)])
   }
   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
@@ -21,6 +21,16 @@ 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"))
+    expect_equal(s$palette(1), c("c"))
+    expect_equal(s$palette(2), c("c", "a"))
+    expect_equal(s$palette(3), c("c", "a", "b"))
+    expect_error(s$palette(4), "Insufficient values")
+  }
+})
+
 
 dat <- data_frame(g = c("B","A","A"))
 p <- ggplot(dat, aes(g, fill = g)) + geom_bar()