Skip to content
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.

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

Make title, subtitle, caption and tag as labs()'s named arguments #2669

Merged
merged 14 commits into from Aug 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
Expand Up @@ -46,6 +46,9 @@
coordinates of the geometries. You can customize the calculation method via
`fun.geometry` argument (@yutannihilation, #2761).

* `labs()` now has named arguments `title`, `subtitle`, `caption`, and `tag`.
Also, `labs()` now accepts tidyeval (@yutannihilation, #2669).

# ggplot2 3.0.0

## Breaking changes
Expand Down
36 changes: 27 additions & 9 deletions R/labels.r
Expand Up @@ -29,11 +29,21 @@ update_labels <- function(p, labels) {
#' the first argument, the `name`). If you're changing other scale options, this
#' is recommended.
#'
#' @param label The text for the axis, plot title or caption below the plot.
#' @param subtitle the text for the subtitle for the plot which will be
#' displayed below the title. Leave `NULL` for no subtitle.
#' @param ... A list of new name-value pairs. The name should either be
#' an aesthetic, or one of "title", "subtitle", "caption", or "tag".
#' If a plot already has a title, subtitle, caption, etc., and you want to
#' remove it, you can do so by setting the respective argument to `NULL`. For
#' example, if plot `p` has a subtitle, then `p + labs(subtitle = NULL)` will
#' remove the subtitle from the plot.
#'
#' @param label The title of the respective axis (for `xlab()` or `ylab()`) or
#' of the plot (for `ggtitle()`).
#' @param title The text for the title.
#' @param subtitle The text for the subtitle for the plot which will be
#' displayed below the title.
#' @param caption The text for the caption which will be displayed in the
#' bottom-right of the plot by default.
#' @param tag The text for the tag label which will be displayed at the
#' top-left of the plot by default.
#' @param ... A list of new name-value pairs. The name should be an aesthetic.
#' @export
#' @examples
#' p <- ggplot(mtcars, aes(mpg, wt, colour = cyl)) + geom_point()
Expand All @@ -52,10 +62,18 @@ update_labels <- function(p, labels) {
#' # The plot tag appears at the top-left, and is typically used
#' # for labelling a subplot with a letter.
#' p + labs(title = "title", tag = "A")
labs <- function(...) {
args <- list(...)
if (is.list(args[[1]])) args <- args[[1]]
#'
#' # If you want to remove a label, set it to NULL.
#' p + labs(title = "title") + labs(title = NULL)
labs <- function(..., title = waiver(), subtitle = waiver(), caption = waiver(), tag = waiver()) {
args <- rlang::list2(..., title = title, subtitle = subtitle, caption = caption, tag = tag)

is_waive <- vapply(args, is.waive, logical(1))
args <- args[!is_waive]
# remove duplicated arguments
args <- args[!duplicated(names(args))]
args <- rename_aes(args)

structure(args, class = "labels")
}

Expand All @@ -73,6 +91,6 @@ ylab <- function(label) {

#' @rdname labs
#' @export
ggtitle <- function(label, subtitle = NULL) {
ggtitle <- function(label, subtitle = waiver()) {
labs(title = label, subtitle = subtitle)
}
31 changes: 24 additions & 7 deletions man/labs.Rd

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

23 changes: 23 additions & 0 deletions tests/testthat/test-labels.r
Expand Up @@ -25,6 +25,29 @@ test_that("setting guide labels works", {
expect_identical(labs(colour = "my label")$colour, "my label")
# American spelling
expect_identical(labs(color = "my label")$colour, "my label")

# No extra elements exists
expect_equivalent(labs(title = "my title"), list(title = "my title")) # formal argument
expect_equivalent(labs(colour = "my label"), list(colour = "my label")) # dot
expect_equivalent(labs(foo = "bar"), list(foo = "bar")) # non-existent param

# labs() has list-splicing semantics
params <- list(title = "my title", tag = "A)")
expect_identical(labs(!!!params)$tag, "A)")

# NULL is preserved
expect_equivalent(labs(title = NULL), list(title = NULL))

# ggtitle works in the same way as labs()
expect_identical(ggtitle("my title")$title, "my title")
expect_identical(
ggtitle("my title", subtitle = "my subtitle")$subtitle,
"my subtitle"
)
expect_equivalent(
ggtitle("my title", subtitle = NULL),
list(title = "my title", subtitle = NULL)
)
})


Expand Down