export theme as class

Author: teunbrand

NAMESPACE

@@ -292,6 +292,7 @@ export(check_device)
 export(class_ggplot)
 export(class_ggplot_built)
 export(class_mapping)
+export(class_theme)
 export(combine_vars)
 export(complete_theme)
 export(continuous_scale)

R/plot-construction.R

@@ -68,7 +68,7 @@ S7::method(`+`, list(class_ggplot, S7::class_any)) <- function(e1, e2) {
   add_ggplot(e1, e2, e2name)
 }
 
-S7::method(`+`, list(theme, S7::class_any)) <- function(e1, e2) {
+S7::method(`+`, list(class_theme, S7::class_any)) <- function(e1, e2) {
   e2name <- deparse(substitute(e2, env = caller_env(2)))
   add_theme(e1, e2, e2name)
 }
@@ -164,7 +164,7 @@ S7::method(ggplot_add, list(class_mapping, class_ggplot)) <-
     S7::set_props(plot, mapping = class_mapping(defaults(object, plot@mapping)))
   }
 
-S7::method(ggplot_add, list(theme, class_ggplot)) <-
+S7::method(ggplot_add, list(class_theme, class_ggplot)) <-
   function(object, plot, ...) {
     S7::set_props(plot, theme = add_theme(plot@theme, object))
   }

R/plot.R

@@ -30,7 +30,7 @@ class_ggplot <- S7::new_class(
     scales  = class_scales_list,
     guides  = class_guides,
     mapping = class_mapping,
-    theme   = theme,
+    theme   = class_theme,
     coordinates = class_coord,
     facet   = class_facet,
     layout  = class_layout,

R/theme.R

@@ -549,25 +549,39 @@ theme <- function(...,
       el
     })
   }
-  S7::new_object(
-    elements,
-    complete = complete,
-    validate = validate
-  )
+  class_theme(elements, complete = complete, validate = validate)
 }
 
-theme <- S7::new_class(
+#' The theme class
+#'
+#' The theme class holds information on how non-data elements of the plot
+#' should be rendered. The preferred way to construct an object of this class
+#' is through the [`theme()`] function.
+#'
+#' @param elements A named list containing theme elements.
+#' @param complete A boolean value stating whether a theme is complete.
+#' @param validate A boolean value stating whether a theme should still be
+#'   validated.
+#'
+#' @export
+class_theme <- S7::new_class(
   "theme", S7::new_S3_class("gg"),
   properties = list(
     complete = S7::class_logical,
     validate = S7::class_logical
   ),
-  constructor = theme
+  constructor = function(elements, complete, validate) {
+    S7::new_object(
+      elements,
+      complete = complete,
+      validate = validate
+    )
+  }
 )
 
 #' @export
 #' @rdname is_tests
-is.theme <- function(x) S7::S7_inherits(x, theme)
+is.theme <- function(x) S7::S7_inherits(x, class_theme)
 
 # check whether theme is complete
 is_theme_complete <- function(x) {