Merge branch 'main' into Yunuuuu-main

Author: teunbrand

.github/workflows/R-CMD-check.yaml

@@ -58,7 +58,21 @@ jobs:
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
+      # TODO: remove this when R 4.6 is released
+      - name: Tweak for old Windows (R 4.1)
+        uses: r-lib/actions/setup-r-dependencies@v2
+        if: ${{ matrix.config.os == 'windows-latest' && matrix.config.r == 'oldrel-4' }}
+        with:
+          cache-version: 3
+          extra-packages: >
+            any::rcmdcheck,
+            [email protected],
+            Hmisc=?ignore-before-r=4.2.0,
+            quantreg=?ignore-before-r=4.3.0
+          needs: check
+
       - uses: r-lib/actions/setup-r-dependencies@v2
+        if: ${{ matrix.config.os != 'windows-latest' || matrix.config.r != 'oldrel-4' }}
         with:
           cache-version: 3
           extra-packages: >

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ggplot2
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
-Version: 3.5.2.9002
+Version: 4.0.0.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0003-4757-117X")),
@@ -52,6 +52,7 @@ Suggests:
     ggplot2movies,
     hexbin,
     Hmisc,
+    hms,
     knitr,
     mapproj,
     maps,
@@ -83,7 +84,7 @@ Config/usethis/last-upkeep: 2025-04-23
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 Collate:
     'ggproto.R'
     'ggplot-global.R'

NEWS.md

@@ -1,5 +1,17 @@
 # ggplot2 (development version)
 
+### Bug fixes
+
+* 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).
+
+
+* Allow `stat` in `geom_hline`, `geom_vline`, and `geom_abline`. (@sierrajohnson, #6559)
+
+# ggplot2 4.0.0
+
 ## User facing
 
 ### Breaking changes

R/backports.R

@@ -1,26 +1,7 @@
-# Backport fix from R 3.3:
-# https://github.com/wch/r-source/commit/4efc81c98d262f93de9e7911aaa910f5c63cd00f
-if (getRversion() < "3.3") {
-  absolute.units <- utils::getFromNamespace("absolute.units", "grid")
-  absolute.units.unit <- utils::getFromNamespace("absolute.units.unit", "grid")
-  absolute.units.unit.list <- utils::getFromNamespace("absolute.units.unit.list", "grid")
-  absolute.units.unit.arithmetic <- utils::getFromNamespace("absolute.units.unit.arithmetic", "grid")
-
-  backport_unit_methods <- function() {
-    registerS3method("absolute.units", "unit", absolute.units.unit)
-    registerS3method("absolute.units", "unit.list", absolute.units.unit.list)
-    registerS3method("absolute.units", "unit.arithmetic", absolute.units.unit.arithmetic)
-  }
-} else {
-  backport_unit_methods <- function() {}
-}
-
 # enable usage of <S7_object>@name in package code
 #' @rawNamespace if (getRversion() < "4.3.0") importFrom("S7", "@")
 NULL
 
-on_load(backport_unit_methods())
-
 unitType <- function(x) {
   unit <- attr(x, "unit")
   if (!is.null(unit)) {

R/geom-abline.R

@@ -69,11 +69,13 @@ NULL
 #'   geom_hline(aes(yintercept = wt, colour = wt), mean_wt) +
 #'   facet_wrap(~ cyl)
 geom_abline <- function(mapping = NULL, data = NULL,
+                        stat = "identity", 
                         ...,
                         slope,
                         intercept,
                         na.rm = FALSE,
-                        show.legend = NA) {
+                        show.legend = NA,
+                        inherit.aes = FALSE) {
 
   # If nothing set, default to y = x
   if (is.null(mapping) && missing(slope) && missing(intercept)) {
@@ -108,11 +110,11 @@ geom_abline <- function(mapping = NULL, data = NULL,
   layer(
     data = data,
     mapping = mapping,
-    stat = StatIdentity,
+    stat = stat,
     geom = GeomAbline,
     position = PositionIdentity,
     show.legend = show.legend,
-    inherit.aes = FALSE,
+    inherit.aes = inherit.aes,
     params = list2(
       na.rm = na.rm,
       ...

R/geom-count.R

@@ -3,7 +3,7 @@ NULL
 
 #' Count overlapping points
 #'
-#' This is a variant [geom_point()] that counts the number of
+#' This is a variant of [geom_point()] that counts the number of
 #' observations at each location, then maps the count to point area. It
 #' useful when you have discrete data and overplotting.
 #'

R/geom-hline.R

@@ -4,11 +4,12 @@ NULL
 #' @export
 #' @rdname geom_abline
 geom_hline <- function(mapping = NULL, data = NULL,
-                       position = "identity",
+                       stat = "identity", position = "identity",
                        ...,
                        yintercept,
                        na.rm = FALSE,
-                       show.legend = NA) {
+                       show.legend = NA,
+                      inherit.aes = FALSE) {
 
   # Act like an annotation
   if (!missing(yintercept)) {
@@ -28,11 +29,11 @@ geom_hline <- function(mapping = NULL, data = NULL,
   layer(
     data = data,
     mapping = mapping,
-    stat = StatIdentity,
+    stat = stat,
     geom = GeomHline,
     position = position,
     show.legend = show.legend,
-    inherit.aes = FALSE,
+    inherit.aes = inherit.aes,
     params = list2(
       na.rm = na.rm,
       ...

R/geom-polygon.R

@@ -41,9 +41,6 @@ GeomPolygon <- ggproto("GeomPolygon", Geom,
         )
       )
     } else {
-      if (getRversion() < "3.6") {
-        cli::cli_abort("Polygons with holes requires R 3.6 or above.")
-      }
       # Sort by group to make sure that colors, fill, etc. come in same order
       munched <- munched[order(munched$group, munched$subgroup), ]
       id <- match(munched$subgroup, unique0(munched$subgroup))
@@ -177,16 +174,3 @@ GeomPolygon <- ggproto("GeomPolygon", Geom,
 #'   p
 #' }
 geom_polygon <- make_constructor(GeomPolygon)
-
-# Assigning pathGrob in .onLoad ensures that packages that subclass GeomPolygon
-# do not install with error `possible error in 'pathGrob(munched$x, munched$y, ':
-# unused argument (pathId = munched$group)` despite the fact that this is correct
-# usage
-pathGrob <- NULL
-on_load(
-  if (getRversion() < as.numeric_version("3.6")) {
-    pathGrob <- function(..., pathId.lengths) {
-      grid::pathGrob(...)
-    }
-  }
-)

R/geom-vline.R

@@ -4,11 +4,12 @@ NULL
 #' @export
 #' @rdname geom_abline
 geom_vline <- function(mapping = NULL, data = NULL,
-                       position = "identity",
+                      stat = "identity", position = "identity",
                        ...,
                        xintercept,
                        na.rm = FALSE,
-                       show.legend = NA) {
+                       show.legend = NA,
+                      inherit.aes = FALSE) {
 
   # Act like an annotation
   if (!missing(xintercept)) {
@@ -28,11 +29,11 @@ geom_vline <- function(mapping = NULL, data = NULL,
   layer(
     data = data,
     mapping = mapping,
-    stat = StatIdentity,
+    stat = stat,
     geom = GeomVline,
     position = position,
     show.legend = show.legend,
-    inherit.aes = FALSE,
+    inherit.aes = inherit.aes,
     params = list2(
       na.rm = na.rm,
       ...

R/guides-.R

@@ -659,7 +659,8 @@ Guides <- ggproto(
       if (!stretch_spacing) {
         spacing <- convertWidth(spacing, "cm")
       }
-      heights <- unit(height_cm(lapply(heights, sum)), "cm")
+
+      total_height <- max(inject(unit.c(!!!lapply(heights, sum))))
 
       if (stretch_x || stretch_spacing) {
         widths   <- redistribute_null_units(widths, spacing, margin, "width")
@@ -672,14 +673,14 @@ Guides <- ggproto(
       # Set global justification
       vp <- viewport(
         x = global_xjust, y = global_yjust, just = global_just,
-        height = max(heights),
+        height = total_height,
         width  = vp_width
       )
 
       # Initialise gtable as legends in a row
       guides <- gtable_row(
         name = "guides", grobs = grobs,
-        widths = widths, height = max(heights),
+        widths = widths, height = total_height,
         vp = vp
       )
 
@@ -701,7 +702,7 @@ Guides <- ggproto(
       if (!stretch_spacing) {
         spacing <- convertWidth(spacing, "cm")
       }
-      widths  <- unit(width_cm(lapply(widths, sum)), "cm")
+      total_width <- max(inject(unit.c(!!!lapply(widths, sum))))
 
       if (stretch_y || stretch_spacing) {
         heights   <- redistribute_null_units(heights, spacing, margin, "height")
@@ -715,13 +716,13 @@ Guides <- ggproto(
       vp <- viewport(
         x = global_xjust, y = global_yjust, just = global_just,
         height = vp_height,
-        width =  max(widths)
+        width =  total_width
       )
 
       # Initialise gtable as legends in a column
       guides <- gtable_col(
         name = "guides", grobs = grobs,
-        width = max(widths), heights = heights,
+        width = total_width, heights = heights,
         vp = vp
       )