Skip to content

Don't strip classes in Geom$use_defaults() #5657

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 3 commits into from
Jan 23, 2024
Merged

Don't strip classes in Geom$use_defaults() #5657

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
00a5ee8
Use `vec_cbind()` instead of data.frame assignment
teunbrand Jan 22, 2024
51220b1
ignore rownames in test
teunbrand Jan 22, 2024
f47ecd1
Add test for AsIs class
teunbrand Jan 22, 2024
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
3 changes: 1 addition & 2 deletions R/geom-.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@ Geom <- ggproto("Geom",
# Override mappings with params
aes_params <- intersect(self$aesthetics(), names(params))
check_aesthetics(params[aes_params], nrow(data))
data[aes_params] <- params[aes_params]
data
vec_cbind(data[setdiff(names(data), aes_params)], !!!params[aes_params])
},

# Most parameters for the geom are taken automatically from draw_panel() or
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-geom-smooth.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test_that("data is ordered by x", {
ps <- ggplot(df, aes(x, y))+
geom_smooth(stat = "identity", se = FALSE)

expect_equal(layer_data(ps)[c("x", "y")], df[order(df$x), ])
expect_equal(layer_data(ps)[c("x", "y")], df[order(df$x), ], ignore_attr = TRUE)
})

test_that("geom_smooth works in both directions", {
Expand Down
13 changes: 13 additions & 0 deletions tests/testthat/test-layer.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,19 @@ test_that("layer warns for constant aesthetics", {

# Data extraction ---------------------------------------------------------

test_that("AsIs data passes unmodified", {
p <- ggplot() + geom_blank(aes(x = 1:2, y = 1:2))
ld <- layer_data(p + geom_point(aes(x = I(0.5), y = I(0.5))), 2)
expect_s3_class(ld$x, "AsIs")
expect_equal(ld$y, I(0.5))
ld <- layer_data(p + geom_point(x = I(0.5), y = I(0.5), data = mtcars), 2)
expect_s3_class(ld$x, "AsIs")
expect_equal(ld$y[1], I(0.5))
ld <- layer_data(p + annotate("point", x = I(0.5), y = I(0.5)), 2)
expect_s3_class(ld$x, "AsIs")
expect_equal(ld$y, I(0.5))
})

test_that("layer_data returns a data.frame", {
l <- geom_point()
expect_equal(l$layer_data(mtcars), unrowname(mtcars))
Expand Down