backward compatibility for ggplot class

Author: teunbrand

NAMESPACE

@@ -1,15 +1,21 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method("$","ggplot2::ggplot")
 S3method("$","ggplot2::theme")
 S3method("$",ggproto)
 S3method("$",ggproto_parent)
+S3method("$<-","ggplot2::ggplot")
 S3method("$<-","ggplot2::mapping")
 S3method("+",gg)
+S3method("[","ggplot2::ggplot")
 S3method("[","ggplot2::mapping")
 S3method("[",mapped_discrete)
+S3method("[<-","ggplot2::ggplot")
 S3method("[<-","ggplot2::mapping")
 S3method("[<-",mapped_discrete)
+S3method("[[","ggplot2::ggplot")
 S3method("[[",ggproto)
+S3method("[[<-","ggplot2::ggplot")
 S3method("[[<-","ggplot2::mapping")
 S3method(.DollarNames,ggproto)
 S3method(as.data.frame,mapped_discrete)

R/bench.R

@@ -15,7 +15,7 @@
 benchplot <- function(x) {
   x <- enquo(x)
   construct <- system.time(x <- eval_tidy(x))
-  check_inherits(x, "ggplot")
+  check_inherits(x, "ggplot2::ggplot")
 
   build <- system.time(data <- ggplot_build(x))
   render <- system.time(grob <- ggplot_gtable(data))

R/facet-.R

@@ -493,7 +493,7 @@ check_vars <- function(x) {
   }
   # Native pipe have higher precedence than + so any type of gg object can be
   # expected here, not just ggplot
-  if (inherits(x, "gg")) {
+  if (S7::S7_inherits(x, class_gg)) {
     cli::cli_abort(c(
       "Please use {.fn vars} to supply facet variables.",
       "i" = "Did you use {.code %>%} or {.code |>} instead of {.code +}?"

R/facet-grid-.R

@@ -196,7 +196,7 @@ grid_as_facets_list <- function(rows, cols) {
       msg <- "{.arg rows} must be {.code NULL} or a {.fn vars} list if {.arg cols} is a {.fn vars} list."
       # Native pipe have higher precedence than + so any type of gg object can be
       # expected here, not just ggplot
-      if (inherits(rows, "gg")) {
+      if (S7::S7_inherits(rows, class_gg)) {
         msg <- c(
           msg,
           "i" = "Did you use {.code %>%} or {.code |>} instead of {.code +}?"

R/layer-sf.R

@@ -45,7 +45,7 @@ LayerSf <- ggproto("LayerSf", Layer,
     # automatically determine the name of the geometry column
     # and add the mapping if it doesn't exist
     if ((isTRUE(self$inherit.aes) && is.null(self$computed_mapping$geometry) &&
-         is.null(plot$computed_mapping$geometry)) ||
+         is.null(self$computed_mapping$geometry)) ||
         (!isTRUE(self$inherit.aes) && is.null(self$computed_mapping$geometry))) {
       if (is_sf(data)) {
         geometry_col <- attr(data, "sf_column")

R/layer.R

@@ -205,7 +205,7 @@ validate_mapping <- function(mapping, call = caller_env()) {
     msg <- "{.arg mapping} must be created by {.fn aes}."
     # Native pipe have higher precedence than + so any type of gg object can be
     # expected here, not just ggplot
-    if (inherits(mapping, "gg")) {
+    if (S7::S7_inherits(mapping, class_gg)) {
       msg <- c(msg, "i" = "Did you use {.code %>%} or {.code |>} instead of {.code +}?")
     }
 

R/plot.R

@@ -153,6 +153,7 @@ ggplot.default <- function(data = NULL, mapping = aes(), ...,
     layout = ggproto(NULL, Layout),
     labels = labs()
   )
+  class(p) <- union("ggplot", class(p))
 
   set_last_plot(p)
   p
@@ -243,3 +244,38 @@ S7::method(print, class_ggplot) <-
 
   invisible(x)
 }
+
+#' @export
+`$.ggplot2::ggplot` <- function(x, i) {
+  `[[`(S7::props(x), i)
+}
+
+#' @export
+`$<-.ggplot2::ggplot` <- function(x, i, value) {
+  S7::props(x) <- `$<-`(S7::props(x), i, value)
+  x
+}
+
+#' @export
+`[.ggplot2::ggplot` <- function(x, i) {
+  `[`(S7::props(x), i)
+}
+
+#' @export
+`[<-.ggplot2::ggplot` <- function(x, i, value) {
+  S7::props(x) <- `[<-`(S7::props(x), i, value)
+  x
+}
+
+#' @export
+`[[.ggplot2::ggplot` <- function(x, i) {
+  `[[`(S7::props(x), i)
+}
+
+#' @export
+`[[<-.ggplot2::ggplot` <- function(x, i, value) {
+  S7::props(x) <- `[[<-`(S7::props(x), i, value)
+  x
+}
+
+

tests/testthat/test-qplot.R

@@ -3,20 +3,25 @@ test_that("qplot works with variables in data frame and parent env", {
   y <- 1:10
   b <- 1:10
 
+
   lifecycle::expect_deprecated(
-    expect_s3_class(qplot(x, y, data = df), "ggplot")
+    p <- qplot(x, y, data = df)
   )
+  expect_s7_class(p, class_ggplot)
   lifecycle::expect_deprecated(
-    expect_s3_class(qplot(x, y, data = df, colour = a), "ggplot")
+    p <- qplot(x, y, data = df, colour = a)
   )
+  expect_s7_class(p, class_ggplot)
   lifecycle::expect_deprecated(
-    expect_s3_class(qplot(x, y, data = df, colour = b), "ggplot")
+    p <- qplot(x, y, data = df, colour = b)
   )
+  expect_s7_class(p, class_ggplot)
 
   bin <- 1
   lifecycle::expect_deprecated(
-    expect_s3_class(qplot(x, data = df, binwidth = bin), "ggplot")
+    p <- qplot(x, data = df, binwidth = bin)
   )
+  expect_s7_class(p, class_ggplot)
 })
 
 test_that("qplot works in non-standard environments", {
@@ -27,7 +32,7 @@ test_that("qplot works in non-standard environments", {
       qplot(x, breaks = 0:`-1-`)
     })
   )
-  expect_s3_class(p, "ggplot")
+  expect_s7_class(p, class_ggplot)
 })
 
 test_that("qplot() evaluates constants in the right place", {