add colour/fill to element_geom

Author: teunbrand

R/theme-elements.R

@@ -213,7 +213,9 @@ element_geom <- function(
   # text
   family = NULL, fontsize = NULL,
   # points
-  pointsize = NULL, pointshape = NULL) {
+  pointsize = NULL, pointshape = NULL,
+
+  colour = NULL, color = NULL, fill = NULL) {
 
   if (!is.null(fontsize)) {
     fontsize <- fontsize / .pt
@@ -227,7 +229,9 @@ element_geom <- function(
       linewidth = linewidth, borderwidth = borderwidth,
       linetype = linetype, bordertype = bordertype,
       family = family, fontsize = fontsize,
-      pointsize = pointsize, pointshape = pointshape
+      pointsize = pointsize, pointshape = pointshape,
+      colour = color %||% colour,
+      fill = fill
     ),
     class = c("element_geom", "element")
   )
@@ -238,7 +242,8 @@ element_geom <- function(
   linewidth = 0.5, borderwidth = 0.5,
   linetype = 1L, bordertype = 1L,
   family = "", fontsize = 11,
-  pointsize = 1.5, pointshape = 19
+  pointsize = 1.5, pointshape = 19,
+  fill = NULL, colour = NULL
 )
 
 #' @export

R/theme.R

@@ -760,6 +760,11 @@ calc_element <- function(element, theme, verbose = FALSE, skip_blank = FALSE,
     # 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, "element_geom")) {
+      # Geom elements are expected to have NULL fill/colour, so allow these
+      # to be missing
+      nullprops[c("colour", "fill")] <- FALSE
+    }
     if (!any(nullprops)) {
       return(el_out) # no null properties remaining, return element
     }