Skip to content

Fix regression in colour/fill scale name redirection #6642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix regression in colour/fill scale name redirection #6642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acdeae4
new colour scales feed first argument to `name`
teunbrand Sep 24, 2025
481cbe1
add test
teunbrand Sep 24, 2025
7956394
add news bullet
teunbrand Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ggplot2 (development version)

### Bug fixes

* Fixed regression where the first (unnamed) argument to colour/fill scales was
not passed as the `name` argument (@teunbrand, #6623)
* Fixed regression where `draw_key_rect()` stopped using `fill` colours
(@mitchelloharawild, #6609).
* Fixed regression where `scale_{x,y}_*()` threw an error when an expression
Expand Down
18 changes: 12 additions & 6 deletions R/scale-colour.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ scale_colour_continuous <- function(..., palette = NULL, aesthetics = "colour",
}
palette <- if (!is.null(palette)) as_continuous_pal(palette)
continuous_scale(
aesthetics, palette = palette, guide = guide, na.value = na.value,
aesthetics = aesthetics, palette = palette, guide = guide,
na.value = na.value, scale_name = deprecated(),
...
)
}
Expand All @@ -115,7 +116,8 @@ scale_fill_continuous <- function(..., palette = NULL, aesthetics = "fill", guid
}
palette <- if (!is.null(palette)) as_continuous_pal(palette)
continuous_scale(
aesthetics, palette = palette, guide = guide, na.value = na.value,
aesthetics = aesthetics, palette = palette, guide = guide,
na.value = na.value, scale_name = deprecated(),
...
)
}
Expand All @@ -137,7 +139,8 @@ scale_colour_binned <- function(..., palette = NULL, aesthetics = "colour", guid
}
palette <- if (!is.null(palette)) pal_binned(as_discrete_pal(palette))
binned_scale(
aesthetics, palette = palette, guide = guide, na.value = na.value,
aesthetics = aesthetics, palette = palette, guide = guide,
na.value = na.value, scale_name = deprecated(),
...
)
}
Expand All @@ -158,7 +161,8 @@ scale_fill_binned <- function(..., palette = NULL, aesthetics = "fill", guide =
}
palette <- if (!is.null(palette)) pal_binned(as_discrete_pal(palette))
binned_scale(
aesthetics, palette = palette, guide = guide, na.value = na.value,
aesthetics = aesthetics, palette = palette, guide = guide,
na.value = na.value, scale_name = deprecated(),
...
)
}
Expand Down Expand Up @@ -225,7 +229,8 @@ scale_colour_discrete <- function(..., palette = NULL, aesthetics = "colour", na
}
palette <- if (!is.null(palette)) as_discrete_pal(palette)
discrete_scale(
aesthetics, palette = palette, na.value = na.value,
aesthetics = aesthetics, palette = palette, na.value = na.value,
scale_name = deprecated(),
...
)
}
Expand All @@ -246,7 +251,8 @@ scale_fill_discrete <- function(..., palette = NULL, aesthetics = "fill", na.val
}
palette <- if (!is.null(palette)) as_discrete_pal(palette)
discrete_scale(
aesthetics, palette = palette, na.value = na.value,
aesthetics = aesthetics, palette = palette, na.value = na.value,
scale_name = deprecated(),
...
)
}
Expand Down
19 changes: 19 additions & 0 deletions tests/testthat/test-scale-colour.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,22 @@ test_that("palette arguments can take alternative input", {
expect_equal(alpha(test, 1), hex)

})

test_that("`name` is directed correctly (#6623)", {
# The desired behaviour is that the first argument passed to scales is the
# 'name' argument.

scales <- list(
scale_colour_continuous,
scale_colour_discrete,
scale_colour_binned,
scale_fill_continuous,
scale_fill_discrete,
scale_fill_binned
)

for (scale in scales) {
p <- scale("foobar")
expect_equal(p$name, "foobar")
}
})
Loading