remove draw_element() in favour of element_grob()

Author: teunbrand

NAMESPACE

@@ -29,7 +29,6 @@ S3method(autolayer,default)
 S3method(autoplot,default)
 S3method(c,mapped_discrete)
 S3method(drawDetails,zeroGrob)
-S3method(element_grob,default)
 S3method(format,ggproto)
 S3method(format,ggproto_method)
 S3method(format,rd_section_aesthetics)
@@ -318,7 +317,6 @@ export(cut_width)
 export(datetime_scale)
 export(derive)
 export(discrete_scale)
-export(draw_element)
 export(draw_key_abline)
 export(draw_key_blank)
 export(draw_key_boxplot)

R/theme-elements.R

@@ -463,11 +463,13 @@ element_render <- function(theme, element, ..., name = NULL) {
 #'   usually at least position. See the source code for individual methods.
 #' @keywords internal
 #' @export
-draw_element <- S7::new_generic("draw_element", "element")
+element_grob <- function(element, ...) {
+  UseMethod("element_grob")
+}
 
-S7::method(draw_element, element_blank) <- function(element, ...) zeroGrob()
+S7::method(element_grob, element_blank) <- function(element, ...) zeroGrob()
 
-S7::method(draw_element, element_rect) <-
+S7::method(element_grob, element_rect) <-
   function(element, x = 0.5, y = 0.5, width = 1, height = 1,
            fill = NULL, colour = NULL,
            linewidth = NULL, linetype = NULL, linejoin = NULL,
@@ -486,7 +488,7 @@ S7::method(draw_element, element_rect) <-
     rectGrob(x, y, width, height, gp = modify_list(element_gp, gp), ...)
   }
 
-S7::method(draw_element, element_text) <-
+S7::method(element_grob, element_text) <-
   function(element, label = "", x = NULL, y = NULL,
            family = NULL, face = NULL, colour = NULL, size = NULL,
            hjust = NULL, vjust = NULL, angle = NULL, lineheight = NULL,
@@ -519,7 +521,7 @@ S7::method(draw_element, element_text) <-
               margin_x = margin_x, margin_y = margin_y, debug = element@debug, ...)
   }
 
-S7::method(draw_element, element_line) <-
+S7::method(element_grob, element_line) <-
   function(element, x = 0:1, y = 0:1,
            colour = NULL, linewidth = NULL, linetype = NULL, lineend = NULL,
            linejoin = NULL, arrow.fill = NULL,
@@ -558,7 +560,7 @@ S7::method(draw_element, element_line) <-
     )
   }
 
-S7::method(draw_element, element_polygon) <-
+S7::method(element_grob, element_polygon) <-
   function(element, x = c(0, 0.5, 1, 0.5),
            y = c(0.5, 1, 0.5, 0), fill = NULL,
            colour = NULL, linewidth = NULL,
@@ -580,7 +582,7 @@ S7::method(draw_element, element_polygon) <-
     )
   }
 
-S7::method(draw_element, element_point) <-
+S7::method(element_grob, element_point) <-
   function(element, x = 0.5, y = 0.5, colour = NULL,
            shape = NULL, fill = NULL, size = NULL,
            stroke = NULL, ...,
@@ -594,18 +596,6 @@ S7::method(draw_element, element_point) <-
                default.units = default.units, ...)
   }
 
-# TODO: the S3 generic should be phased out once S7 is adopted more widely
-#' @rdname draw_element
-#' @export
-element_grob <- function(element, ...) {
-  UseMethod("element_grob")
-}
-
-#' @export
-element_grob.default <- function(element, ...) {
-  draw_element(element, ...)
-}
-
 #' Define and register new theme elements
 #'
 #' The underlying structure of a ggplot2 theme is defined via the element tree, which