Skip to content

Make sure that expressions are reencoded as expressions when collapsed #4418

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
thomasp85 merged 3 commits into from
Apr 15, 2021
Merged

Make sure that expressions are reencoded as expressions when collapsed #4418

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
763e38e
Make sure that expressions are reencoded as expressions when collapsed
thomasp85 Apr 14, 2021
26a1371
only reparse if all labels are expressions
thomasp85 Apr 14, 2021
5157aeb
Merge branch 'master' into issue-4084-multiline-label-parse
thomasp85 Apr 15, 2021
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: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ggplot2 (development version)

* Fix bug in `labeller()` where parsing was turned off if `.multiline = FALSE`
(@thomasp85, #4084)

* Fix bug in `geom_dotplot()` where dots would be positioned wrong with
`stackgroups = TRUE` (@thomasp85, #1745)

Expand Down
7 changes: 6 additions & 1 deletion R/labeller.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,13 @@
NULL

collapse_labels_lines <- function(labels) {
is_exp <- vapply(labels, function(l) length(l) > 0 && is.expression(l[[1]]), logical(1))
out <- do.call("Map", c(list(paste, sep = ", "), labels))
list(unname(unlist(out)))
label <- list(unname(unlist(out)))
if (all(is_exp)) {
label <- lapply(label, function(l) list(parse(text = paste0("list(", l, ")"))))
}
label
}

#' @rdname labellers
Expand Down