revert replacement functions

Author: teunbrand

NAMESPACE

@@ -2,9 +2,18 @@
 
 S3method("$",ggproto)
 S3method("$",ggproto_parent)
+S3method("$<-","ggplot2::element")
+S3method("$<-","ggplot2::gg")
+S3method("$<-","ggplot2::mapping")
 S3method("[",mapped_discrete)
+S3method("[<-","ggplot2::element")
+S3method("[<-","ggplot2::gg")
+S3method("[<-","ggplot2::mapping")
 S3method("[<-",mapped_discrete)
 S3method("[[",ggproto)
+S3method("[[<-","ggplot2::element")
+S3method("[[<-","ggplot2::gg")
+S3method("[[<-","ggplot2::mapping")
 S3method(.DollarNames,ggproto)
 S3method(as.data.frame,mapped_discrete)
 S3method(as.list,ggproto)

R/aes.R

@@ -152,15 +152,21 @@ local({
   S7::method(`[`, class_mapping) <- function(x, i, ...) {
     class_mapping(`[`(S7::S7_data(x), i, ...))
   }
-  S7::method(`$<-`, class_mapping) <- S7::method(`[[<-`, class_mapping) <-
-    function(x, i, value) {
-      class_mapping(`[[<-`(S7::S7_data(x), i, value))
-    }
-  S7::method(`[<-`, class_mapping) <- function(x, i, value) {
-    class_mapping(`[<-`(S7::S7_data(x), i, value))
-  }
 })
 
+#' @export
+`[[<-.ggplot2::mapping` <- function(x, i, value) {
+  class_mapping(`[[<-`(S7::S7_data(x), i, value))
+}
+
+#' @export
+`$<-.ggplot2::mapping` <- `[[<-.ggplot2::mapping`
+
+#' @export
+`[<-.ggplot2::mapping` <- function(x, i, value) {
+  class_mapping(`[<-`(S7::S7_data(x), i, value))
+}
+
 #' Standardise aesthetic names
 #'
 #' This function standardises aesthetic names by converting `color` to `colour`

R/plot.R

@@ -248,22 +248,25 @@ local({
   }
 })
 
-local({
-  S7::method(`$<-`, class_gg) <- S7::method(`[[<-`, class_gg) <-
-    function(x, i, value) {
-      if (!S7::prop_exists(x, i) && S7::prop_exists(x, "meta")) {
-        # See explanation in `$.ggplot2::gg`
-        S7::prop(x, "meta")[[i]] <- value
-      } else {
-        S7::props(x) <- `[[<-`(S7::props(x), i, value)
-      }
-      x
-    }
-  S7::method(`[<-`, class_gg) <- function(x, i, value) {
-    S7::props(x) <- `[<-`(S7::props(x), i, value)
-    x
+#' @export
+`[<-.ggplot2::gg` <- function(x, i, value) {
+  S7::props(x) <- `[<-`(S7::props(x), i, value)
+  x
+}
+
+#' @export
+`$<-.ggplot2::gg` <- function(x, i, value) {
+  if (!S7::prop_exists(x, i) && S7::prop_exists(x, "meta")) {
+    # See explanation in accessor
+    S7::prop(x, "meta")[[i]] <- value
+  } else {
+    S7::props(x) <- `[[<-`(S7::props(x), i, value)
   }
-})
+  x
+}
+
+#' @export
+`[[<-.ggplot2::gg` <- `$<-.ggplot2::gg`
 
 #' @importFrom S7 convert
 # S7 currently attaches the S3 method to the calling environment which gives `ggplot2:::as.list`

R/theme-elements.R

@@ -403,23 +403,26 @@ local({
 })
 
 # Element setter methods
-local({
-  S7::method(`$<-`, element) <- function(x, i, value) {
-    # deprecate_soft0("4.1.0", I("`<ggplot2::element>$i <- value`"), I("`<ggplot2::element>@i <- value`"))
-    S7::props(x) <- `[[<-`(S7::props(x), i, value)
-    x
-  }
-  S7::method(`[<-`, element) <- function(x, i, value) {
-    # deprecate_soft0("4.1.0", I("`<ggplot2::element>[i] <- value`"), I("`S7::props(<ggplot2::element>)[i] <- value`"))
-    S7::props(x) <- `[<-`(S7::props(x), i, value)
-    x
-  }
-  S7::method(`[[<-`, element) <- function(x, i, value) {
-    # deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]] <- value`"), I("S7::prop(<ggplot2::element>, i) <- value"))
-    S7::props(x) <- `[[<-`(S7::props(x), i, value)
-    x
-  }
-})
+#' @export
+`$<-.ggplot2::element` <- function(x, i, value) {
+  # deprecate_soft0("4.1.0", I("`<ggplot2::element>$i <- value`"), I("`<ggplot2::element>@i <- value`"))
+  S7::props(x) <- `[[<-`(S7::props(x), i, value)
+  x
+}
+
+#' @export
+`[<-.ggplot2::element` <- function(x, i, value) {
+  # deprecate_soft0("4.1.0", I("`<ggplot2::element>[i] <- value`"), I("`S7::props(<ggplot2::element>)[i] <- value`"))
+  S7::props(x) <- `[<-`(S7::props(x), i, value)
+  x
+}
+
+#' @export
+`[[<-.ggplot2::element` <- function(x, i, value) {
+  # deprecate_soft0("4.1.0", I("`<ggplot2::element>[[i]] <- value`"), I("S7::prop(<ggplot2::element>, i) <- value"))
+  S7::props(x) <- `[[<-`(S7::props(x), i, value)
+  x
+}
 
 #' @export
 print.rel <- function(x, ...) print(noquote(paste(x, " *", sep = "")))