replace is.zero() with is_zero()

Author: teunbrand

R/facet-grid-.R

@@ -430,7 +430,7 @@ ulevels <- function(x, na.last = TRUE) {
 
 table_has_grob <- function(table, pattern) {
   grobs <- table$grobs[grep(pattern, table$layout$name)]
-  !all(vapply(grobs, is.zero, logical(1)))
+  !all(vapply(grobs, is_zero, logical(1)))
 }
 
 seam_table <- function(table, grobs = NULL, side, shift = 1, name, z = 1,

R/facet-wrap.R

@@ -327,7 +327,7 @@ FacetWrap <- ggproto("FacetWrap", Facet,
     if (length(empty_bottom) > 0) {
       x_axes <- original$x$bottom[matched[empty_bottom]]
       clash["bottom"] <- strip == "bottom" && !inside && !free$x &&
-        !all(vapply(x_axes, is.zero, logical(1)))
+        !all(vapply(x_axes, is_zero, logical(1)))
       if (!clash["bottom"]) {
         bottom[empty_bottom] <- x_axes
       }
@@ -336,7 +336,7 @@ FacetWrap <- ggproto("FacetWrap", Facet,
     if (length(empty_top) > 0) {
       x_axes <- original$x$top[matched[empty_top]]
       clash["top"] <- strip == "top" && !inside && !free$x &&
-        !all(vapply(x_axes, is.zero, logical(1)))
+        !all(vapply(x_axes, is_zero, logical(1)))
       if (!clash["top"]) {
         top[empty_top] <- x_axes
       }
@@ -345,7 +345,7 @@ FacetWrap <- ggproto("FacetWrap", Facet,
     if (length(empty_right) > 0) {
       y_axes <- original$y$right[matched[empty_right]]
       clash["right"]  <- strip == "right" && !inside && !free$y &&
-        !all(vapply(y_axes, is.zero, logical(1)))
+        !all(vapply(y_axes, is_zero, logical(1)))
       if (!clash["right"]) {
         right[empty_right] <- y_axes
       }
@@ -354,7 +354,7 @@ FacetWrap <- ggproto("FacetWrap", Facet,
     if (length(empty_left) > 0) {
       y_axes <- original$y$left[matched[empty_left]]
       clash["left"]  <- strip == "left" && !inside && !free$y &&
-        !all(vapply(y_axes, is.zero, logical(1)))
+        !all(vapply(y_axes, is_zero, logical(1)))
       if (!clash["left"]) {
         left[empty_left] <- y_axes
       }
@@ -410,7 +410,7 @@ FacetWrap <- ggproto("FacetWrap", Facet,
 
     if (!inside) {
       axes  <- grepl(paste0("axis-", pos), table$layout$name)
-      has_axes <- !vapply(table$grobs[axes], is.zero, logical(1))
+      has_axes <- !vapply(table$grobs[axes], is_zero, logical(1))
       has_axes <- split(has_axes, table$layout[[pos]][axes])
       has_axes <- vapply(has_axes, sum, numeric(1)) > 0
       padding  <- rep(padding, length(has_axes))

R/grob-null.R

@@ -23,4 +23,9 @@ grobHeight.zeroGrob <- function(x) unit(0, "cm")
 #' @method drawDetails zeroGrob
 drawDetails.zeroGrob <- function(x, recording) {}
 
-is.zero <- function(x) is.null(x) || inherits(x, "zeroGrob")
+is_zero <- function(x) is.null(x) || inherits(x, "zeroGrob")
+
+is.zero <- function(x) {
+  deprecate_warn("4.0.0", "is.zero()", "is_zero()")
+  is_zero(x)
+}

R/guide-.R

@@ -421,7 +421,7 @@ Guide <- ggproto(
   },
 
   add_title = function(gtable, title, position, just) {
-    if (is.zero(title)) {
+    if (is_zero(title)) {
       return(gtable)
     }
 

R/guide-axis-stack.R

@@ -195,7 +195,7 @@ GuideAxisStack <- ggproto(
     }
 
     # Remove empty grobs
-    grobs <- grobs[!vapply(grobs, is.zero, logical(1))]
+    grobs <- grobs[!vapply(grobs, is_zero, logical(1))]
     if (length(grobs) == 0) {
       return(zeroGrob())
     }

R/guide-axis.R

@@ -420,7 +420,7 @@ GuideAxis <- ggproto(
     # Unlist the 'label' grobs
     z <- if (params$position == "left") c(2, 1, 3) else 1:3
     z <- rep(z, c(1, length(grobs$labels), 1))
-    has_labels <- !is.zero(grobs$labels[[1]])
+    has_labels <- !is_zero(grobs$labels[[1]])
     grobs  <- c(list(grobs$ticks), grobs$labels, list(grobs$title))
 
     # Initialise empty gtable

R/guide-legend.R

@@ -544,7 +544,7 @@ GuideLegend <- ggproto(
     gt <- gtable(widths = widths, heights = heights)
 
     # Add keys
-    if (!is.zero(grobs$decor)) {
+    if (!is_zero(grobs$decor)) {
       n_key_layers <- params$n_key_layers %||% 1L
       key_cols <- rep(layout$key_col, each = n_key_layers)
       key_rows <- rep(layout$key_row, each = n_key_layers)
@@ -560,7 +560,7 @@ GuideLegend <- ggproto(
       )
     }
 
-    if (!is.zero(grobs$labels)) {
+    if (!is_zero(grobs$labels)) {
       gt <- gtable_add_grob(
         gt, grobs$labels,
         name = names(labels) %||%
@@ -579,7 +579,7 @@ GuideLegend <- ggproto(
     gt <- gtable_add_padding(gt, unit(elements$padding, "cm"))
 
     # Add background
-    if (!is.zero(elements$background)) {
+    if (!is_zero(elements$background)) {
       gt <- gtable_add_grob(
         gt, elements$background,
         name = "background", clip = "off",

R/guides-.R

@@ -492,7 +492,7 @@ Guides <- ggproto(
     )
 
     grobs <- self$draw(theme, positions, theme$legend.direction)
-    keep <- !vapply(grobs, is.zero, logical(1), USE.NAMES = FALSE)
+    keep <- !vapply(grobs, is_zero, logical(1), USE.NAMES = FALSE)
     grobs <- grobs[keep]
     if (length(grobs) < 1) {
       return(zeroGrob())
@@ -590,7 +590,7 @@ Guides <- ggproto(
   # arguments to collect guides
   package_box = function(grobs, position, theme) {
 
-    if (is.zero(grobs) || length(grobs) == 0) {
+    if (is_zero(grobs) || length(grobs) == 0) {
       return(zeroGrob())
     }
 

R/guides-grid.R

@@ -30,7 +30,7 @@ guide_grid <- function(theme, panel_params, coord, square = TRUE) {
   grill <- compact(grill)
 
   background <- element_render(theme, "panel.background")
-  if (!isTRUE(square) && !is.zero(background)) {
+  if (!isTRUE(square) && !is_zero(background)) {
     gp <- background$gp
     background <- data_frame0(x = c(1, 1, -1, -1), y = c(1, -1, -1, 1)) * Inf
     background <- coord_munch(coord, background, panel_params, is_closed = TRUE)

R/labeller.R

@@ -546,7 +546,7 @@ build_strip <- function(label_df, labeller, theme, horizontal) {
 #'
 #' @noRd
 assemble_strips <- function(grobs, theme, horizontal = TRUE, clip) {
-  if (length(grobs) == 0 || is.zero(grobs[[1]])) {
+  if (length(grobs) == 0 || is_zero(grobs[[1]])) {
     # Subsets matrix of zeroGrobs to correct length (#4050)
     grobs <- grobs[seq_len(NROW(grobs))]
     return(grobs)