more consistently use new test functions

Author: teunbrand

R/coord-sf.R

@@ -334,7 +334,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
 
     # we don't draw the graticules if the major panel grid is
     # turned off
-    if (inherits(el, "element_blank")) {
+    if (is_theme_element(el, "blank")) {
       grobs <- list(element_render(theme, "panel.background"))
     } else {
       line_gp <- gg_par(

R/guide-axis-theta.R

@@ -183,7 +183,7 @@ GuideAxisTheta <- ggproto(
 
   build_labels = function(key, elements, params) {
 
-    if (inherits(elements$text, "element_blank")) {
+    if (is_theme_element(elements$text, "blank")) {
       return(zeroGrob())
     }
 
@@ -267,7 +267,7 @@ GuideAxisTheta <- ggproto(
     key <- params$key
     key <- vec_slice(key, !is.na(key$.label) & nzchar(key$.label))
     labels <- validate_labels(key$.label)
-    if (length(labels) == 0 || inherits(elements$text, "element_blank")) {
+    if (length(labels) == 0 || is_theme_element(elements$text, "blank")) {
       return(list(offset = offset))
     }
 
@@ -364,7 +364,7 @@ GuideAxisTheta <- ggproto(
 
 theta_tickmarks <- function(key, element, length, offset = NULL) {
   n_breaks <- nrow(key)
-  if (n_breaks < 1 || inherits(element, "element_blank")) {
+  if (n_breaks < 1 || is_theme_element(element, "blank")) {
     return(zeroGrob())
   }
 

R/guide-axis.R

@@ -379,7 +379,7 @@ GuideAxis <- ggproto(
     # Ticks
     major_cm <- convertUnit(elements$major_length, "cm", valueOnly = TRUE)
     range <- range(0, major_cm)
-    if (params$minor.ticks && !inherits(elements$minor, "element_blank")) {
+    if (params$minor.ticks && !is_theme_element(elements$minor, "blank")) {
       minor_cm <- convertUnit(elements$minor_length, "cm", valueOnly = TRUE)
       range <- range(range, minor_cm)
     }
@@ -590,7 +590,7 @@ axis_label_priority_between <- function(x, y) {
 #'   overridden from the user- or theme-supplied element.
 #' @noRd
 label_angle_heuristic <- function(element, position, angle) {
-  if (!inherits(element, "element_text")
+  if (!is_theme_element(element, "text")
       || is.null(position)
       || is.null(angle %|W|% NULL)) {
     return(element)

R/layer.R

@@ -497,7 +497,7 @@ validate_subclass <- function(x, subclass,
     return(obj)
   }
   # Try prying the class from a layer
-  if (inherits(obj, "Layer")) {
+  if (is_layer(obj)) {
     obj <- switch(
       subclass,
       Geom = obj$geom,

R/plot-build.R

@@ -348,7 +348,7 @@ table_add_tag <- function(table, label, theme) {
     return(table)
   }
   element <- calc_element("plot.tag", theme)
-  if (inherits(element, "element_blank")) {
+  if (is_theme_element(element, "blank")) {
     return(table)
   }
 

R/theme-elements.R

@@ -841,7 +841,7 @@ check_element <- function(el, elname, element_tree, call = caller_env()) {
   if ("margin" %in% eldef$class) {
     if (!is.unit(el) && length(el) == 4)
       cli::cli_abort("The {.var {elname}} theme element must be a {.cls unit} vector of length 4.", call = call)
-  } else if (!inherits(el, eldef$class) && !inherits(el, "element_blank")) {
+  } else if (!inherits(el, eldef$class) && !is_theme_element(el, "blank")) {
     cli::cli_abort("The {.var {elname}} theme element must be a {.cls {eldef$class}} object.", call = call)
   }
   invisible()

R/theme.R

@@ -737,7 +737,7 @@ calc_element <- function(element, theme, verbose = FALSE, skip_blank = FALSE,
 
   # If result is element_blank, we skip it if `skip_blank` is `TRUE`,
   # and otherwise we don't inherit anything from parents
-  if (inherits(el_out, "element_blank")) {
+  if (is_theme_element(el_out, "blank")) {
     if (isTRUE(skip_blank)) {
       el_out <- NULL
     } else {
@@ -827,7 +827,7 @@ merge_element <- function(new, old) {
 #' @rdname merge_element
 #' @export
 merge_element.default <- function(new, old) {
-  if (is.null(old) || inherits(old, "element_blank")) {
+  if (is.null(old) || is_theme_element(old, "blank")) {
     # If old is NULL or element_blank, then just return new
     return(new)
   } else if (is.null(new) || is.character(new) || is.numeric(new) || is.unit(new) ||
@@ -850,7 +850,7 @@ merge_element.element_blank <- function(new, old) {
 #' @rdname merge_element
 #' @export
 merge_element.element <- function(new, old) {
-  if (is.null(old) || inherits(old, "element_blank")) {
+  if (is.null(old) || is_theme_element(old, "blank")) {
     # If old is NULL or element_blank, then just return new
     return(new)
   }
@@ -875,7 +875,7 @@ merge_element.element <- function(new, old) {
 #' @rdname merge_element
 #' @export
 merge_element.margin <- function(new, old) {
-  if (is.null(old) || inherits(old, "element_blank")) {
+  if (is.null(old) || is_theme_element(old, "blank")) {
     return(new)
   }
   if (anyNA(new)) {
@@ -894,7 +894,7 @@ merge_element.margin <- function(new, old) {
 combine_elements <- function(e1, e2) {
 
   # If e2 is NULL, nothing to inherit
-  if (is.null(e2) || inherits(e1, "element_blank")) {
+  if (is.null(e2) || is_theme_element(e1, "blank")) {
     return(e1)
   }
 
@@ -917,7 +917,7 @@ combine_elements <- function(e1, e2) {
     return(e1)
   }
 
-  if (inherits(e1, "margin") && inherits(e2, "margin")) {
+  if (is_margin(e1) && is_margin(e2)) {
     if (anyNA(e2)) {
       e2[is.na(e2)] <- unit(0, "pt")
     }
@@ -933,7 +933,7 @@ combine_elements <- function(e1, e2) {
 
   # If e2 is element_blank, and e1 inherits blank inherit everything from e2,
   # otherwise ignore e2
-  if (inherits(e2, "element_blank")) {
+  if (is_theme_element(e2, "blank")) {
     if (e1$inherit.blank) {
       return(e2)
     } else {
@@ -955,7 +955,7 @@ combine_elements <- function(e1, e2) {
     e1$linewidth <- e2$linewidth * unclass(e1$linewidth)
   }
 
-  if (inherits(e1, "element_text")) {
+  if (is_theme_element(e1, "text")) {
     e1$margin <- combine_elements(e1$margin, e2$margin)
   }