implement $.element for backward compatibility

Author: teunbrand

NAMESPACE

@@ -1,8 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method("$",ggproto)
-S3method("$",ggproto_parent)
-S3method("$",theme)
 S3method("$<-",uneval)
 S3method("+",gg)
 S3method("[",mapped_discrete)
@@ -16,6 +13,9 @@ S3method(as.data.frame,mapped_discrete)
 S3method(as.list,ggproto)
 S3method(autolayer,default)
 S3method(autoplot,default)
+S3method(base::`$`, ggproto)
+S3method(base::`$`, ggproto_parent)
+S3method(base::`$`, theme)
 S3method(c,mapped_discrete)
 S3method(drawDetails,zeroGrob)
 S3method(format,ggproto)

R/ggproto.R

@@ -152,7 +152,8 @@ fetch_ggproto <- function(x, name) {
 
 }
 
-#' @export
+# Prevents bug described in S7/#390
+#' @rawNamespace S3method(base::`$`, ggproto)
 `$.ggproto` <- function(x, name) {
   res <- fetch_ggproto(x, name)
   if (!is.function(res)) {
@@ -162,7 +163,7 @@ fetch_ggproto <- function(x, name) {
   make_proto_method(x, res, name)
 }
 
-#' @export
+#' @rawNamespace S3method(base::`$`, ggproto_parent)
 `$.ggproto_parent` <- function(x, name) {
   res <- fetch_ggproto(.subset2(x, "parent"), name)
   if (!is.function(res)) {

R/theme-elements.R

@@ -83,6 +83,14 @@ NULL
 #' @rdname element
 element <- S7::new_class("element", abstract = TRUE)
 
+S7::method(`$`, element) <-
+  function(x, i) {
+    if (!S7::prop_exists(x, i)) {
+      return(NULL)
+    }
+    S7::prop(x, i)
+  }
+
 #' @export
 #' @rdname element
 element_blank <- S7::new_class("element_blank", parent = element)

R/theme.R

@@ -942,7 +942,8 @@ combine_elements <- function(e1, e2) {
   e1
 }
 
-#' @export
+# Prevents bug described in S7/#390
+#' @rawNamespace S3method(base::`$`, theme)
 `$.theme` <- function(x, ...) {
   .subset2(x, ...)
 }