Use S7 properties

Author: teunbrand

R/coord-sf.R

@@ -334,13 +334,13 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
 
     # we don't draw the graticules if the major panel grid is
     # turned off
-    if (inherits(el, "element_blank")) {
+    if (S7::S7_inherits(el, element_blank)) {
       grobs <- list(element_render(theme, "panel.background"))
     } else {
       line_gp <- gg_par(
-        col = el$colour,
-        lwd = el$linewidth,
-        lty = el$linetype
+        col = el@colour,
+        lwd = el@linewidth,
+        lty = el@linetype
       )
       grobs <- c(
         list(element_render(theme, "panel.background")),

R/geom-.R

@@ -248,7 +248,7 @@ eval_from_theme <- function(aesthetics, theme) {
     return(aesthetics)
   }
   settings <- calc_element("geom", theme) %||% .default_geom_element
-  lapply(aesthetics[themed], eval_tidy, data = settings)
+  lapply(aesthetics[themed], eval_tidy, data = S7::props(settings))
 }
 
 #' Graphical units

R/guide-axis-theta.R

@@ -153,7 +153,7 @@ GuideAxisTheta <- ggproto(
     }
 
     offset <- max(unit(0, "pt"), elements$major_length, elements$minor_length)
-    elements$offset <- offset + max(elements$text$margin %||% unit(0, "pt"))
+    elements$offset <- offset + max(elements$text@margin %||% unit(0, "pt"))
     elements
   },
 
@@ -197,7 +197,7 @@ GuideAxisTheta <- ggproto(
 
     # Resolve text angle
     if (is.waiver(params$angle) || is.null(params$angle)) {
-      angle <- elements$text$angle
+      angle <- elements$text@angle
     } else {
       angle <- flip_text_angle(params$angle - rad2deg(key$theta))
     }
@@ -273,14 +273,14 @@ GuideAxisTheta <- ggproto(
 
     # Resolve text angle
     if (is.waiver(params$angle %||% waiver())) {
-      angle <- elements$text$angle
+      angle <- elements$text@angle
     } else {
       angle <- flip_text_angle(params$angle - rad2deg(key$theta))
     }
     angle <- key$theta + deg2rad(angle)
 
     # Set margin
-    margin <- rep(max(elements$text$margin), length.out = 4)
+    margin <- rep(max(elements$text@margin), length.out = 4)
 
     # Measure size of each individual label
     single_labels <- lapply(labels, function(lab) {

R/guide-axis.R

@@ -450,13 +450,13 @@ GuideAxis <- ggproto(
     # rather than dimensions of this axis alone.
     if (has_labels && params$position %in% c("left", "right")) {
       where <- layout$l[-c(1, length(layout$l))]
-      just <- with(elements$text, rotate_just(angle, hjust, vjust))$hjust %||% 0.5
+      just <- with(S7::props(elements$text), rotate_just(angle, hjust, vjust))$hjust %||% 0.5
       gt <- gtable_add_cols(gt, unit(just, "null"), pos = min(where) - 1)
       gt <- gtable_add_cols(gt, unit(1 - just, "null"), pos = max(where) + 1)
     }
     if (has_labels && params$position %in% c("top", "bottom")) {
       where <- layout$t[-c(1, length(layout$t))]
-      just <- with(elements$text, rotate_just(angle, hjust, vjust))$vjust %||% 0.5
+      just <- with(S7::props(elements$text), rotate_just(angle, hjust, vjust))$vjust %||% 0.5
       gt <- gtable_add_rows(gt, unit(1 - just, "null"), pos = min(where) - 1)
       gt <- gtable_add_rows(gt, unit(just, "null"), pos = max(where) + 1)
     }
@@ -612,8 +612,8 @@ label_angle_heuristic <- function(element, position, angle) {
   hjust <- switch(position, left = cosine, right = 1 - cosine, top = 1 - sine, sine)
   vjust <- switch(position, left = 1 - sine, right = sine, top = 1 - cosine, cosine)
 
-  element$angle <- angle %||% element$angle
-  element$hjust <- hjust %||% element$hjust
-  element$vjust <- vjust %||% element$vjust
+  element@angle <- angle %||% element@angle
+  element@hjust <- hjust %||% element@hjust
+  element@vjust <- vjust %||% element@vjust
   element
 }

R/guide-custom.R

@@ -113,7 +113,7 @@ GuideCustom <- ggproto(
 
     gt <- self$add_title(
       gt, title, title_position,
-      with(elems$title, rotate_just(angle, hjust, vjust))
+      with(S7::props(elems$title), rotate_just(angle, hjust, vjust))
     )
 
     # Add padding and background

R/guide-legend.R

@@ -325,7 +325,7 @@ GuideLegend <- ggproto(
     # Resolve title. The trick here is to override the main text element, so
     # that any settings declared in `legend.title` will be honoured but we have
     # custom defaults for the guide.
-    margin <- calc_element("text", theme)$margin
+    margin <- calc_element("text", theme)@margin
     title <- theme(text = element_text(
       hjust = 0, vjust = 0.5,
       margin = position_margin(title_position, margin, gap)
@@ -573,7 +573,7 @@ GuideLegend <- ggproto(
 
     gt <- self$add_title(
       gt, grobs$title, elements$title_position,
-      with(elements$title, rotate_just(angle, hjust, vjust))
+      with(S7::props(elements$title), rotate_just(angle, hjust, vjust))
     )
 
     gt <- gtable_add_padding(gt, unit(elements$padding, "cm"))

R/plot-build.R

@@ -387,20 +387,20 @@ table_add_tag <- function(table, label, theme) {
   if (location %in% c("plot", "panel")) {
     if (!is.numeric(position)) {
       if (right || left) {
-        x <- (1 - element$hjust) * width
+        x <- (1 - element@hjust) * width
         if (right) {
           x <- unit(1, "npc") - x
         }
       } else {
-        x <- unit(element$hjust, "npc")
+        x <- unit(element@hjust, "npc")
       }
       if (top || bottom) {
-        y <- (1 - element$vjust) * height
+        y <- (1 - element@vjust) * height
         if (top) {
           y <- unit(1, "npc") - y
         }
       } else {
-        y <- unit(element$vjust, "npc")
+        y <- unit(element@vjust, "npc")
       }
     } else {
       x <- unit(position[1], "npc")

R/theme.R

@@ -746,14 +746,22 @@ calc_element <- function(element, theme, verbose = FALSE, skip_blank = FALSE,
     if (verbose) cli::cli_inform("nothing (top level)")
 
     # Check that all the properties of this element are non-NULL
-    nullprops <- vapply(el_out, is.null, logical(1))
+    if (inherits(el_out, "ggplot2::element")) {
+      nullprops <- lengths(S7::props(el_out)) == 0
+    } else {
+      nullprops <- vapply(el_out, is.null, logical(1))
+    }
     if (!any(nullprops)) {
       return(el_out) # no null properties, return element as is
     }
 
     # if we have null properties, try to fill in from ggplot_global$theme_default
     el_out <- combine_elements(el_out, ggplot_global$theme_default[[element]])
-    nullprops <- vapply(el_out, is.null, logical(1))
+    if (inherits(el_out, "ggplot2::element")) {
+      nullprops <- lengths(S7::props(el_out)) == 0
+    } else {
+      nullprops <- vapply(el_out, is.null, logical(1))
+    }
     if (!any(nullprops)) {
       return(el_out) # no null properties remaining, return element
     }

tests/testthat/_snaps/theme.md

@@ -25,7 +25,7 @@
 # incorrect theme specifications throw meaningful errors
 
     Can't merge the `line` theme element.
-    Caused by error in `merge_element()`:
+    Caused by error in `method(merge_element, list(ggplot2::element, class_any))`:
     ! Only elements of the same class can be merged.
 
 ---
@@ -74,7 +74,7 @@
     Code
       merge_element(text_base, rect_base)
     Condition
-      Error in `merge_element()`:
+      Error in `method(merge_element, list(ggplot2::element, class_any))`:
       ! Only elements of the same class can be merged.
 
 # Theme elements are checked during build