Add support for ggplot2 3.5 patterns and gradients

- See https://www.tidyverse.org/blog/2024/02/ggplot2-3-5-0/#patterns-and-gradients
-  #50, thanks @trevorld

Author: wilkox

DESCRIPTION

@@ -12,7 +12,7 @@ BugReports: https://github.com/wilkox/treemapify/issues/
 Description: Provides 'ggplot2' geoms for drawing treemaps.
 Depends: R (>= 3.6)
 Imports:
-    ggplot2 (>= 2.2.1),
+    ggplot2 (>= 3.5),
     ggfittext (>= 0.5.0),
     grid (>= 3.1),
     cli (>= 3.6.1)

NEWS.md

@@ -1,5 +1,11 @@
 # treemapify (development version)
 
+## Major changes
+
+- Add support for ggplot2 3.5 patterns and gradients (see
+  https://www.tidyverse.org/blog/2024/02/ggplot2-3-5-0/#patterns-and-gradients;
+  #50, thanks @trevorld)
+
 ## Minor changes
 
 - Change default roundrect radius in GeomTreemap to 0 pts (#48, thanks @davidhodge931)

R/a-rect.R

@@ -47,7 +47,7 @@ GeomRrect <- ggplot2::ggproto(
         just = c("left", "top"),
         gp = grid::gpar(
           col = coords$colour[i],
-          fill = alpha(coords$fill[i], coords$alpha[i]),
+          fill = ggplot2::fill_alpha(coords$fill[i], coords$alpha[i]),
           lwd = coords$size[i] * .pt,
           lty = coords$linetype[i],
           lineend = "butt"

R/geom_treemap.R

@@ -134,7 +134,7 @@ draw_key_rrect <- function(data, params, size) {
     name = "lkey",
     gp = grid::gpar(
       col = data$colour %l0% "white",
-      fill = alpha(data$fill %||% data$colour %||% "grey20", data$alpha),
+      fill = ggplot2::fill_alpha(data$fill %||% data$colour %||% "grey20", data$alpha),
       lty = data$linetype %||% 1
     )
   )
@@ -197,7 +197,7 @@ GeomTreemap <- ggplot2::ggproto(
         just = c("left", "top"),
         gp = grid::gpar(
           col = data$colour[i],
-          fill = ggplot2::alpha(data$fill[i], data$alpha[i]),
+          fill = ggplot2::fill_alpha(data$fill[i], data$alpha[i]),
           lwd = data$size[i],
           lty = data$linetype[i]
         )

tests/testthat/test_plots.R

@@ -105,4 +105,18 @@ test_that("plots look the way they should", {
                                            list(color = c("red", "black"))))
   })
 
+  # vdiffr does not support patterns
+  expect_no_error({
+    patterns <- list(
+      linearGradient(c("red", "blue"), group = FALSE),
+      linearGradient(c("yellow", "orange"), group = FALSE),
+      linearGradient(c("purple", "white"), group = FALSE),
+      linearGradient(c("pink", "green"), group = FALSE)
+    )
+    G4 <- G20[1:4, ]
+    ggplot2::ggplot(G4, ggplot2::aes(area = gdp_mil_usd, fill = country)) +
+      geom_treemap() +
+      ggplot2::scale_fill_manual(values = patterns)
+  })
+
 })