Skip to content
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
24 changes: 19 additions & 5 deletions R/plot-build.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#' plot). In `get_panel_scales()`, the row of a facet to return scales for.
#' @param j An integer. In `get_panel_scales()`, the column of a facet to return
#' scales for.
#' @param name A scalar string. In `get_layer_data()` and `get_layer_grob()`, the name of the layer
#' to return. If provided and existing, this takes precedence over `i`.
#' @param ... Not currently in use.
#' @seealso
#' [print.ggplot()] and [benchplot()] for
Expand Down Expand Up @@ -141,9 +143,16 @@ build_ggplot <- S7::method(ggplot_build, class_ggplot) <- function(plot, ...) {

#' @export
#' @rdname ggplot_build
get_layer_data <- function(plot = get_last_plot(), i = 1L) {
ggplot_build(plot)@data[[i]]
get_layer_data <- function(plot = get_last_plot(), i = 1L, name = NA) {
if (is.na(name)) {
idx <- i
} else {
name <- arg_match0(name, names(p@layers))
idx <- which(name == names(p@layers))
}
ggplot_build(plot)@data[[idx]]
}

#' @export
#' @rdname ggplot_build
layer_data <- get_layer_data
Expand All @@ -168,10 +177,15 @@ layer_scales <- get_panel_scales

#' @export
#' @rdname ggplot_build
get_layer_grob <- function(plot = get_last_plot(), i = 1L) {
get_layer_grob <- function(plot = get_last_plot(), i = 1L, name = NA) {
b <- ggplot_build(plot)

b@plot@layers[[i]]$draw_geom(b@data[[i]], b@layout)
if (is.na(name)) {
idx <- i
} else {
idx <- arg_match0(name, names(p@layers))
idx <- which(name == names(p@layers))
}
b@plot@layers[[idx]]$draw_geom(b@data[[idx]], b@layout)
}

#' @export
Expand Down
11 changes: 7 additions & 4 deletions man/ggplot_build.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions tests/testthat/_snaps/layer.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,11 @@

`layer_data()` must return a <data.frame>.

# get_layer_data works with layer names

`name` must be one of "foo" or "bar", not "none".

# get_layer_grob works with layer names

`name` must be one of "foo" or "bar", not "none".

30 changes: 30 additions & 0 deletions tests/testthat/test-layer.R
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,36 @@ test_that("layer_data returns a data.frame", {
expect_snapshot_error(l$layer_data(mtcars))
})

test_that("get_layer_data works with layer names", {
p <- ggplot() + geom_point(name = "foo") + geom_point(name = "bar")

# name has higher precedence than index
expect_identical(
get_layer_data(p, i = 1L, name = "bar"),
get_layer_data(p, i = 2L)
)

# name falls back to index
expect_snapshot_error(
get_layer_data(p, i = 1L, name = "none")
)
})

test_that("get_layer_grob works with layer names", {
p <- ggplot() + geom_point(name = "foo") + geom_point(name = "bar")

# name has higher precedence than index
expect_identical(
get_layer_grob(p, i = 1L, name = "bar"),
get_layer_grob(p, i = 2L)
)

# name falls back to index
expect_snapshot_error(
get_layer_grob(p, i = 1L, name = "none")
)
})

test_that("data.frames and matrix aesthetics survive the build stage", {
df <- data_frame0(
x = 1:2,
Expand Down
Loading