Skip to content

Domesticate NULL aesthetic labels #6644

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

Merged
merged 8 commits into from
Oct 20, 2025
Merged

Domesticate NULL aesthetic labels #6644

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78be71d
labels derived from NULL aesthetics serve only as fallback labels
teunbrand Sep 24, 2025
2a8cd27
catch tests where this occurs
teunbrand Sep 24, 2025
aa762b5
add news bullet
teunbrand Sep 24, 2025
c19876c
atomic vectors also produce fallback labels
teunbrand Oct 7, 2025
4fcdc37
move `make_labels()` helper to file where it is used
teunbrand Oct 7, 2025
54d2b3f
update test
teunbrand Oct 7, 2025
7b751d0
fix guide order in unrelated test
teunbrand Oct 7, 2025
261eafa
Merge branch 'main' into fix_NULL_aesthetics_label
teunbrand Oct 20, 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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

### Bug fixes

* Fixed regression where `NULL`-aesthetics contributed to plot labels too
insistently. Now they contribute only as fallback labels (@teunbrand, #6616)
* 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
5 changes: 4 additions & 1 deletion R/aes-evaluation.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,10 @@ strip_stage <- function(expr) {
make_labels <- function(mapping) {
default_label <- function(aesthetic, mapping) {
# e.g., geom_smooth(aes(colour = "loess")) or aes(y = NULL)
if (is.null(mapping) || is.atomic(mapping)) {
if (is.null(mapping)) {
return(structure(aesthetic, fallback = TRUE))
}
if (is.atomic(mapping)) {
return(aesthetic)
}
Copy link
Collaborator Author

@teunbrand teunbrand Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is an argument to be made to also have atomic mappings return fallback labels.
#6616 (comment)

Copy link
Member

@thomasp85 thomasp85 Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I'm in favour of this

Copy link
Collaborator Author

@teunbrand teunbrand Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went ahead and implemented this after I pulsed your opinion in slack, so this should be ready for review

mapping <- strip_stage(mapping)
Expand Down
6 changes: 5 additions & 1 deletion tests/testthat/test-aes-calculated.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ test_that("make_labels() deparses mappings properly", {
expect_match(x_lab, "...$")
# if the mapping is a literal or NULL, the aesthetics is used
expect_identical(make_labels(aes(x = 1)), list(x = "x"))
expect_identical(make_labels(aes(x = NULL)), list(x = "x"))
# NULL labels should only be used as fallback labels
expect_identical(
make_labels(aes(x = NULL)),
list(x = structure("x", fallback = TRUE))
)
})

test_that("staged aesthetics warn appropriately for duplicated names", {
Expand Down
3 changes: 2 additions & 1 deletion tests/testthat/test-aes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ test_that("quosures are squashed when creating default label for a mapping", {
test_that("labelling doesn't cause error if aesthetic is NULL", {
p <- ggplot(mtcars) + aes(x = NULL)
labels <- ggplot_build(p)@plot@labels
expect_identical(labels$x, "x")
# NULL labels should only be used as fallback labels
expect_identical(labels$x, structure("x", fallback = TRUE))
})

test_that("aes standardises aesthetic names", {
Expand Down
Loading