Merge branch 'main' into check_subclass_fallback

Author: teunbrand

NEWS.md

@@ -1,7 +1,7 @@
 # ggplot2 (development version)
 
-* When `check_subclass()` fails to find a class directly, it tries to retrieve
-  the class via constructor functions.
+* Date scales silently coerce <POSIXct> to <Date> and datetime scales silently
+  coerce <Date> to <POSIXct> (@laurabrianna, #3533)
 * New parameters for `geom_label()` (@teunbrand and @steveharoz, #5365):
   * The `linewidth` aesthetic is now applied and replaces the `label.size` 
     argument.
@@ -310,6 +310,10 @@
   (@teunbrand, #3669). 
 * Added `scale_{x/y}_time(date_breaks, date_minor_breaks, date_labels)` 
   (@teunbrand, #4335).
+* `ggsave()` can write a multi-page pdf file when provided with a list of plots 
+  (@teunbrand, #5093).
+* (internal) When `validate_subclass()` fails to find a class directly, it tries 
+  to retrieve the class via constructor functions (@teunbrand).
 
 # ggplot2 3.5.1
 

R/save.R

@@ -101,17 +101,18 @@ ggsave <- function(filename, plot = get_last_plot(),
   dev <- validate_device(device, filename, dpi = dpi)
   dim <- plot_dim(c(width, height), scale = scale, units = units,
     limitsize = limitsize, dpi = dpi)
+  bg  <- get_plot_background(plot, bg)
 
-  if (is_null(bg)) {
-    bg <- calc_element("plot.background", plot_theme(plot))$fill %||% "transparent"
-  }
   old_dev <- grDevices::dev.cur()
   dev(filename = filename, width = dim[1], height = dim[2], bg = bg, ...)
   on.exit(utils::capture.output({
     grDevices::dev.off()
     if (old_dev > 1) grDevices::dev.set(old_dev) # restore old device unless null device
   }))
-  grid.draw(plot)
+  if (!is_bare_list(plot)) {
+    plot <- list(plot)
+  }
+  lapply(plot, grid.draw)
 
   invisible(filename)
 }
@@ -235,6 +236,17 @@ plot_dim <- function(dim = c(NA, NA), scale = 1, units = "in",
   dim
 }
 
+get_plot_background <- function(plot, bg = NULL, default = "transparent") {
+  if (!is.null(bg)) {
+    return(bg)
+  }
+  plot <- if (is_bare_list(plot)) plot[[1]] else plot
+  if (!is.ggplot(plot)) {
+    return(default)
+  }
+  calc_element("plot.background", plot_theme(plot))$fill %||% default
+}
+
 validate_device <- function(device, filename = NULL, dpi = 300, call = caller_env()) {
   force(filename)
   force(dpi)

R/scale-date.R

@@ -394,6 +394,9 @@ ScaleContinuousDatetime <- ggproto("ScaleContinuousDatetime", ScaleContinuous,
         i = "The value was converted to {obj_type_friendly(x)}."
       ), call = self$call)
     }
+    if (inherits(x, "Date")) {
+      x <- as.POSIXct(x)
+    }
     ggproto_parent(ScaleContinuous, self)$transform(x)
   },
   map = function(self, x, limits = self$get_limits()) {
@@ -441,6 +444,9 @@ ScaleContinuousDate <- ggproto("ScaleContinuousDate", ScaleContinuous,
         i = "The value was converted to {obj_type_friendly(x)}."
       ), call = self$call)
     }
+    if (inherits(x, "POSIXct")) {
+      x <- as.Date(x)
+    }
     ggproto_parent(ScaleContinuous, self)$transform(x)
   },
   get_breaks = function(self, limits = self$get_limits()) {

tests/testthat/test-scale_date.R

@@ -1,4 +1,19 @@
 
+test_that("date(time) scales coerce data types", {
+
+  date     <- as.Date("2024-11-11")
+  datetime <- as.POSIXct(date)
+
+  sc <- scale_x_datetime()
+  df <- sc$transform_df(data_frame0(x = date))
+  expect_equal(df$x, as.numeric(datetime))
+
+  sc <- scale_x_date()
+  df <- sc$transform_df(data_frame0(x = datetime))
+  expect_equal(df$x, as.numeric(date))
+
+})
+
 # Visual tests ------------------------------------------------------------
 
 test_that("date scale draws correctly", {