Merge branch 'main' into lgaborini-layer-names

Author: teunbrand

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ggplot2
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
-Version: 4.0.0.9000
+Version: 4.0.1.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0003-4757-117X")),

NEWS.md

@@ -1,35 +1,47 @@
 # ggplot2 (development version)
 
+# ggplot2 4.0.1
+
+This is a smaller patch release focussed on fixing regressions from 4.0.0 and 
+polishing the recent features.
+
+## Bug fixes
+
 * Fixed regression where `geom_area()` didn't draw panels with single groups 
   when `stat = "align"` (@teunbrand, #6680)
 * Fixed regression where `position_stack(vjust)` was ignored when there are
   only single groups (#6692)
 * Fixed bug where `NA` handling in `geom_path()` was ignoring panels (@teunbrand, #6533)
-* Logical values for the linetype aesthetic will be interpreted numerically,
-  so that `linetype = FALSE` becomes 0/'blank' and `linetype = TRUE` becomes 
-  1/'solid' (@teunbrand, #6641)
-* Out-of-bounds datapoints used as padding by `stat_align()` now get removed
-  silently rather than verbosely (@teunbrand, #6667)
 * Fixed bug where `stat_bin(boundary)` was ignored (#6682).
 * `geom_text()` and `geom_label()` accept expressions as the `label` aesthetic 
   (@teunbrand, #6638)
 * Fixed regression where `draw_key_rect()` stopped using `fill` colours 
   (@mitchelloharawild, #6609).
 * Fixed regression where `scale_{x,y}_*()` threw an error when an expression
   object is set to `labels` argument (@yutannihilation, #6617).
-* Improved palette fallback mechanism in scales (@teunbrand, #6669).
-* Allow `stat` in `geom_hline`, `geom_vline`, and `geom_abline`. (@sierrajohnson, #6559)
-* `stat_boxplot()` treats `width` as an optional aesthetic (@Yunuuuu, #6575)
 * Fixed regression where the first (unnamed) argument to colour/fill scales was 
   not passed as the `name` argument (@teunbrand, #6623)
 * Fixed issue where vectorised `arrow()`s caused errors in drawing the 
   legend glyphs (@teunbrand, #6594)
 * Fixed regression where `NULL`-aesthetics contributed to plot labels too 
   insistently. Now they contribute only as fallback labels (@teunbrand, #6616)
+* Fixed regression where empty arguments to colour/fill scale caused errors
+  (@jmbarbone, #6710)
+* Fixed axis misplacement in `coor_radial()` when labels are blank (@teunbrand, #6574)
+
+## Improvements
+
+* Improved palette fallback mechanism in scales (@teunbrand, #6669).
+* Allow `stat` in `geom_hline`, `geom_vline`, and `geom_abline`. (@sierrajohnson, #6559)
+* `stat_boxplot()` treats `width` as an optional aesthetic (@Yunuuuu, #6575)
 * The `theme(panel.widths, panel.heights)` setting attempts to preserve the
   plot's aspect ratio when only one of the two settings is given, and the plot 
   has a single panel (@teunbrand, #6701).
-* Fixed axis misplacement in `coor_radial()` when labels are blank (@teunbrand, #6574)
+* Logical values for the linetype aesthetic will be interpreted numerically,
+  so that `linetype = FALSE` becomes 0/'blank' and `linetype = TRUE` becomes 
+  1/'solid' (@teunbrand, #6641)
+* Out-of-bounds datapoints used as padding by `stat_align()` now get removed
+  silently rather than verbosely (@teunbrand, #6667)
 
 # ggplot2 4.0.0
 

R/labels.R

@@ -175,7 +175,13 @@ make_labels <- function(mapping) {
 #'        See [get_alt_text] for examples. `alt` can also be a function that
 #'        takes the plot as input and returns text as output. `alt` also accepts
 #'        rlang [lambda][rlang::as_function()] function notation.
-#' @param ... A list of new name-value pairs. The name should be an aesthetic.
+#' @param ...
+#' New name-value pairs. The name should be an aesthetic. The values can be
+#' one of the following:
+#' * A string or expression to set a label verbatim.
+#' * A function to use as formatter for the default label.
+#' * `NULL` to remove a label.
+#' * A [`waiver()`] to use the default label.
 #' @export
 #'
 #' @seealso

R/layer.R

@@ -972,9 +972,8 @@ normalise_label <- function(label) {
     return(NULL)
   }
   if (obj_is_list(label)) {
-    # Ensure that each element in the list has length 1
+    # Ensure no elements are empty
     label[lengths(label) == 0] <- ""
-    label <- lapply(label, `[`, 1)
   }
   if (is.expression(label)) {
     # Classed expressions, when converted to lists, retain their class.

R/position-.R

@@ -102,6 +102,10 @@ Position <- ggproto(
   #' A data frame with completed layer data
   use_defaults = function(self, data, params = list()) {
 
+    if (empty(data)) {
+      return(data)
+    }
+
     aes <- self$aesthetics()
     defaults <- self$default_aes
 
@@ -113,6 +117,13 @@ Position <- ggproto(
       return(data)
     }
 
+    empty_aes <- names(params)[lengths(params) == 0]
+    if (length(empty_aes) > 0) {
+      # The Geom$use_defaults method will already warn about this, we just need
+      # to ignore this here.
+      params <- params[setdiff(names(params), empty_aes)]
+    }
+
     new <- compact(lapply(defaults, eval_tidy, data = data))
     new[names(params)] <- params
     check_aesthetics(new, nrow(data))

R/scale-colour.R

@@ -285,7 +285,8 @@ check_scale_type <- function(scale, name, aesthetic, scale_is_discrete = FALSE,
 scale_backward_compatibility <- function(..., scale, aesthetic, type) {
   aesthetic <- standardise_aes_names(aesthetic[1])
 
-  args <- list2(...)
+  # input ... may have trailing args, which then get stuck in the middle #6710
+  args <- dots_list(..., .ignore_empty = "all")
   args$call <- args$call %||% caller_call() %||% current_call()
 
   if (type == "binned") {

R/stat-align.R

@@ -77,7 +77,7 @@ StatAlign <- ggproto(
 
   finish_layer = function(data, params) {
     # Silently remove out-of-bounds padding vertices
-    var <- flipped_names(params$flipped_aes)$x
+    var <- flipped_names(params$flipped_aes %||% FALSE)$x
     remove <- is.na(data[[var]]) & (data$align_padding %||% FALSE)
     vec_slice(data, !remove)
   }

R/utilities-help.R

@@ -90,7 +90,7 @@ rd_orientation <- function() {
   c(
     "@section Orientation: ",
     paste(
-      'This geom treats each axis differently and, thus, can thus have two orientations.',
+      'This geom treats each axis differently and, thus, can have two orientations.',
       'Often the orientation is easy to deduce from a combination of the given',
       'mappings and the types of positional scales in use. Thus, ggplot2 will by',
       'default try to guess which orientation the layer should have. Under rare',

README.Rmd

@@ -42,7 +42,7 @@ pak::pak("tidyverse/ggplot2")
 
 ## Cheatsheet
 
-<a href="https://github.com/rstudio/cheatsheets/blob/master/data-visualization.pdf"><img src="https://raw.githubusercontent.com/rstudio/cheatsheets/master/pngs/thumbnails/data-visualization-cheatsheet-thumbs.png" width="630" height="252" alt="ggplot2 cheatsheet" /></a>
+<a href="https://github.com/rstudio/cheatsheets/blob/main/data-visualization.pdf"><img src="https://raw.githubusercontent.com/rstudio/cheatsheets/main/pngs/thumbnails/data-visualization-cheatsheet-thumbs.png" width="630" height="252" alt="ggplot2 cheatsheet" /></a>
 
 ## Usage
 
@@ -76,7 +76,7 @@ If you are new to ggplot2 you are better off starting with a systematic introduc
     [Communication][r4ds-comm] chapters in
     [R for Data Science][r4ds]. R for Data Science is designed to
     give you a comprehensive introduction to the
-    [tidyverse](https://www.tidyverse.org), and these two chapters will
+    [tidyverse](https://tidyverse.org/), and these two chapters will
     get you up to speed with the essentials of ggplot2 as quickly as
     possible.
 
@@ -119,4 +119,4 @@ There are two main places to get help with ggplot2:
 [r4ds-vis]: https://r4ds.hadley.nz/data-visualize
 [r4ds-comm]: https://r4ds.hadley.nz/communication
 [oreilly]: https://learning.oreilly.com/videos/data-visualization-in/9781491963661/
-[blog]: https://www.tidyverse.org/tags/ggplot2/
+[blog]: https://tidyverse.org/tags/ggplot2/

README.md

@@ -35,7 +35,7 @@ pak::pak("tidyverse/ggplot2")
 
 ## Cheatsheet
 
-<a href="https://github.com/rstudio/cheatsheets/blob/master/data-visualization.pdf"><img src="https://raw.githubusercontent.com/rstudio/cheatsheets/master/pngs/thumbnails/data-visualization-cheatsheet-thumbs.png" width="630" height="252" alt="ggplot2 cheatsheet" /></a>
+<a href="https://github.com/rstudio/cheatsheets/blob/main/data-visualization.pdf"><img src="https://raw.githubusercontent.com/rstudio/cheatsheets/main/pngs/thumbnails/data-visualization-cheatsheet-thumbs.png" width="630" height="252" alt="ggplot2 cheatsheet" /></a>
 
 ## Usage
 
@@ -80,8 +80,8 @@ documentation pages. Currently, there are several good places to start:
     [Communication](https://r4ds.hadley.nz/communication) chapters in [R
     for Data Science](https://r4ds.hadley.nz). R for Data Science is
     designed to give you a comprehensive introduction to the
-    [tidyverse](https://www.tidyverse.org), and these two chapters will
-    get you up to speed with the essentials of ggplot2 as quickly as
+    [tidyverse](https://tidyverse.org/), and these two chapters will get
+    you up to speed with the essentials of ggplot2 as quickly as
     possible.
 
 2.  If you’d like to take an online course, try [Data Visualization in R
@@ -105,7 +105,7 @@ documentation pages. Currently, there are several good places to start:
     graphics specifically tailored to your needs.
 
 6.  For articles about announcements and deep-dives you can visit the
-    [tidyverse blog](https://www.tidyverse.org/tags/ggplot2/).
+    [tidyverse blog](https://tidyverse.org/tags/ggplot2/).
 
 ## Getting help