move element properties

Author: teunbrand

R/properties.R

@@ -1,4 +1,3 @@
-
 property_boolean <- function(allow_null = FALSE, default = TRUE) {
   class <- S7::class_logical
   class <- if (allow_null) S7::new_union(class, NULL) else class
@@ -38,65 +37,9 @@ property_choice <- function(options, allow_null = FALSE, default = NULL) {
   )
 }
 
-element_props <- list(
-  fill = S7::new_property(
-    S7::new_union(S7::class_character, S7::new_S3_class("GridPattern"), S7::class_logical, NULL),
-    default = NULL
-  ),
-  colour = S7::new_property(
-    S7::new_union(S7::class_character, S7::class_logical, NULL),
-    default = NULL
-  ),
-  family = S7::new_property(
-    S7::new_union(S7::class_character, NULL),
-    default = NULL
-  ),
-  hjust = S7::new_property(
-    S7::new_union(S7::class_numeric, NULL),
-    default = NULL
-  ),
-  vjust = S7::new_property(
-    S7::new_union(S7::class_numeric, NULL),
-    default = NULL
-  ),
-  angle = S7::new_property(
-    S7::new_union(S7::class_numeric, NULL),
-    default = NULL
-  ),
-  size = S7::new_property(
-    S7::new_union(S7::class_numeric, NULL),
-    default = NULL
-  ),
-  lineheight = S7::new_property(
-    S7::new_union(S7::class_numeric, NULL),
-    default = NULL
-  ),
-  margin = S7::new_property(
-    S7::new_union(S7::new_S3_class("margin"), NULL),
-    default = NULL
-  ),
-  face = property_choice(c("plain", "bold", "italic", "oblique", "bold.italic"), allow_null = TRUE),
-  linewidth = S7::new_property(
-    S7::new_union(S7::class_numeric, NULL),
-    default = NULL
-  ),
-  linetype = S7::new_property(
-    S7::new_union(S7::class_numeric, S7::class_character, NULL),
-    default = NULL
-  ),
-  lineend = property_choice(c("round", "butt", "square"), allow_null = TRUE),
-  shape = S7::new_property(
-    S7::new_union(S7::class_numeric, S7::class_character, NULL),
-    default = NULL
-  ),
-  arrow = S7::new_property(
-    S7::new_union(S7::new_S3_class("arrow"), S7::class_logical, NULL),
-    default = NULL
-  ),
-  arrow.fill = S7::new_property(
-    S7::new_union(S7::class_character, S7::class_logical, NULL),
-    default = NULL
-  ),
-  debug = property_boolean(allow_null = TRUE, default = NULL),
-  inherit.blank = property_boolean(default = FALSE)
-)
+property_nullable <- function(class = S7::class_any, ...) {
+  S7::new_property(
+    class = S7::new_union(NULL, class),
+    ...
+  )
+}

R/theme-elements.R

@@ -87,7 +87,28 @@ element <- S7::new_class("element", abstract = TRUE)
 #' @rdname element
 element_blank <- S7::new_class("element_blank", parent = element)
 
-#' @include properties.R
+# All properties are listed here so they can easily be recycled in the different
+# element classes
+element_props <- list(
+  fill       = property_nullable(S7::class_character | S7::new_S3_class("GridPattern") | S7::class_logical),
+  colour     = property_nullable(S7::class_character | S7::class_logical),
+  family     = property_nullable(S7::class_character),
+  hjust      = property_nullable(S7::class_numeric),
+  vjust      = property_nullable(S7::class_numeric),
+  angle      = property_nullable(S7::class_numeric),
+  size       = property_nullable(S7::class_numeric),
+  lineheight = property_nullable(S7::class_numeric),
+  margin     = property_nullable(margin),
+  face       = property_choice(c("plain", "bold", "italic", "oblique", "bold.italic"), allow_null = TRUE),
+  linewidth  = property_nullable(S7::class_numeric),
+  linetype   = property_nullable(S7::class_numeric | S7::class_character),
+  lineend    = property_choice(c("round", "butt", "square"), allow_null = TRUE),
+  shape      = property_nullable(S7::class_numeric | S7::class_character),
+  arrow      = property_nullable(S7::new_S3_class("arrow") | S7::class_logical),
+  arrow.fill = property_nullable(S7::class_character | S7::class_logical),
+  debug      = property_boolean(allow_null = TRUE, default = NULL),
+  inherit.blank = property_boolean(default = FALSE)
+)
 
 #' @export
 #' @rdname element