Layer parameter controlling facet layout #6336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Consider:
|
|
Update:
devtools::load_all("~/packages/ggplot2/")
#> ℹ Loading ggplot2
ggplot(mpg, aes(displ, hwy)) +
geom_point(colour = "grey", layout = "fixed_cols") +
geom_point() +
annotate(
"text", I(0.5), I(0.8), label = "My annotation",
layout = 5
) +
facet_grid(year ~ drv)Created on 2025-02-26 with reprex v2.1.1 Should be ready for review |
teunbrand
changed the title
teunbrand
commented
Feb 26, 2025
R/facet-.R
Outdated
Comment on lines
132
to
141
| # If we need to fix rows or columns, we make the corresponding faceting | ||
| # variables missing on purpose | ||
| if (grid_layout) { | ||
| if (identical(layer_layout, "fixed_rows")) { | ||
| facet_vals <- facet_vals[setdiff(names(facet_vals), names(params$cols))] | ||
| } | ||
| if (identical(layer_layout, "fixed_cols")) { | ||
| facet_vals <- facet_vals[setdiff(names(facet_vals), names(params$rows))] | ||
| } | ||
| } |
There was a problem hiding this comment.
This part is new
teunbrand
commented
Feb 26, 2025
R/facet-.R
Outdated
Comment on lines
174
to
177
| # Filter panels when layer_layout is an integer | ||
| if (is_integerish(layer_layout)) { | ||
| data <- vec_slice(data, data$PANEL %in% layer_layout) | ||
| } |
There was a problem hiding this comment.
This part is new
teunbrand
commented
Feb 26, 2025
R/facet-.R
Outdated
Comment on lines
115
to
118
| include_margins <- !isFALSE(params$margin %||% FALSE) && | ||
| nrow(facet_vals) == nrow(data) && grid_layout | ||
| if (include_margins) { | ||
| # Margins are computed on evaluated faceting values (#1864). |
There was a problem hiding this comment.
I merged the wrap/grid layout mapping because it reduces duplication and the only tangible difference was dealing with margins. Because this makes the diff harder to read, I've put comments at which parts weren't in here before.
teunbrand
commented
Feb 26, 2025
R/facet-.R
Outdated
Comment on lines
103
to
110
| grid_layout <- all(c("rows", "cols") %in% names(params)) | ||
| layer_layout <- attr(data, "layout") | ||
| if (identical(layer_layout, "fixed")) { | ||
| n <- vec_size(data) | ||
| data <- vec_rep(data, vec_size(layout)) | ||
| data$PANEL <- vec_rep_each(layout$PANEL, n) | ||
| return(data) | ||
| } |
thomasp85
approved these changes
Mar 25, 2025
There was a problem hiding this comment.
I do like that logic for grid and wrap has been merged but I don't think it should live as a method in the virtual Facet class.
It assumes existence of properties in params that is not "global"
Can we move this to a free function that both facet_grid() and facet_wrap() calls?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR aims to (eventually) fix #3062.
Briefly, it adds a
layer(layout)argument to control how data is assigned to panels. Currently onlylayout = "fixed"is implemented, which repeats data over every panel. This PR is considered WIP because there might be other strategies that might also be interesting to discuss.Created on 2025-02-18 with reprex v2.1.1