update tests etc

Author: thomasp85

NAMESPACE

@@ -112,8 +112,9 @@ importFrom(ggplot2,ggplotGrob)
 importFrom(ggplot2,ggplot_add)
 importFrom(ggplot2,ggplot_build)
 importFrom(ggplot2,ggplot_gtable)
-importFrom(ggplot2,is.ggplot)
-importFrom(ggplot2,is.theme)
+importFrom(ggplot2,is_ggplot)
+importFrom(ggplot2,is_theme)
+importFrom(ggplot2,is_waiver)
 importFrom(ggplot2,labs)
 importFrom(ggplot2,margin)
 importFrom(ggplot2,max_height)

NEWS.md

@@ -1,5 +1,7 @@
 # patchwork (development version)
 
+* Fixed a load-time bug that could throw spurious warnings
+
 # patchwork 1.3.1
 
 * Prepare for next ggplot2 release

R/aaa.R

@@ -44,5 +44,3 @@ check_object <- function(x,
     call = call
   )
 }
-
-is_waiver <- function(x) inherits(x, "waiver")

R/arithmetic.R

@@ -68,7 +68,7 @@ NULL
   if (is.null(e2)) return(e1)
   if (is.null(e1)) return(e2)
   if (should_autowrap(e2)) e2 <- wrap_elements(full = e2)
-  if (!is.ggplot(e2)) cli_abort("Only knows how to fold ggplot objects together")
+  if (!is_ggplot(e2)) cli_abort("Only knows how to fold ggplot objects together")
   patchwork <- new_patchwork()
   if (is_patchwork(e2)) {
     plot <- plot_filler()
@@ -122,12 +122,12 @@ NULL
   e1 + e2
 }
 #' @rdname plot_arithmetic
-#' @importFrom ggplot2 is.theme
+#' @importFrom ggplot2 is_theme
 #' @export
 "&.gg" <- function(e1, e2) {
   if (is.null(e2)) return(e1)
   if (is_patchwork(e1)) {
-    if (is.theme(e2)) {
+    if (is_theme(e2)) {
       e1$patches$annotation$theme <- e1$patches$annotation$theme + e2
     }
     e1$patches$plots <- lapply(e1$patches$plots, function(p) {

R/free.R

@@ -30,7 +30,7 @@
 #' reserve any space for it. This allows the axis to occupy space in an
 #' otherwise empty area without making additional space available for itself.
 #'
-#' @importFrom ggplot2 is.ggplot
+#' @importFrom ggplot2 is_ggplot
 #' @export
 #'
 #' @examples
@@ -72,7 +72,7 @@
 #' plot_spacer() + free(p1, "space", "l") + p2 + p2
 #'
 free <- function(x, type = c("panel", "label", "space"), side = "trbl") {
-  check_object(x, function(x) is.ggplot(x) || is_patchwork(x), "a <ggplot> or <patchwork> object")
+  check_object(x, function(x) is_ggplot(x) || is_patchwork(x), "a <ggplot> or <patchwork> object")
   type <- arg_match(type)
   side <- tolower(side)
   if (grepl("[^trbl]", side)) {

R/inset_element.R

@@ -70,10 +70,10 @@ inset_element <- function(p, left, bottom, right, top, align_to = 'panel', on_to
   if (!is.unit(top)) {
     top <- unit(top, 'npc')
   }
-  if (!is.ggplot(p)) {
+  if (!is_ggplot(p)) {
     p <- wrap_elements(full = p, clip = FALSE)
   }
-  if (!is.ggplot(p)) {
+  if (!is_ggplot(p)) {
     p <- wrap_elements(full = p, clip = clip)
   }
   clip <- if (clip) 'on' else 'off'

R/plot_annotation.R

@@ -102,6 +102,7 @@ on_load({
 })
 
 #' @importFrom utils modifyList
+#' @importFrom ggplot2 is_waiver
 #' @export
 ggplot_add.plot_annotation <- function(object, plot, object_name) {
   plot <- as_patchwork(plot)
@@ -115,7 +116,7 @@ ggplot_add.plot_annotation <- function(object, plot, object_name) {
   plot$patches$annotation[names(do_change)] <- do_change
   plot
 }
-#' @importFrom ggplot2 is.ggplot labs
+#' @importFrom ggplot2 is_ggplot labs
 recurse_tags <- function(x, levels, prefix, suffix, sep, offset = 1) {
   if (length(levels) == 0) return(list(patches = x, tab_ind = offset))
   level <- get_level(levels[1])

R/plot_layout.R

@@ -43,6 +43,7 @@
 #'
 #' @export
 #'
+#' @importFrom ggplot2 is_waiver
 #' @examples
 #' library(ggplot2)
 #'
@@ -314,6 +315,7 @@ default_layout <- plot_layout(
   axes = 'keep', axis_titles = 'keep'
 )
 #' @importFrom utils modifyList
+#' @importFrom ggplot2 is_waiver
 #' @export
 ggplot_add.plot_layout <- function(object, plot, object_name) {
   plot <- as_patchwork(plot)

R/plot_multipage.R

@@ -128,7 +128,7 @@ ggplot_gtable.fixed_dim_build <- function(data) {
 #' @rdname multipage_align
 #' @export
 get_max_dim <- function(...) {
-  if (is.ggplot(..1)) {
+  if (is_ggplot(..1)) {
     plots <- list(...)
   } else if (is.list(..1)) {
     plots <- ..1
@@ -148,7 +148,7 @@ get_max_dim <- function(...) {
 #' @rdname multipage_align
 #' @export
 align_patches <- function(...) {
-  if (is.ggplot(..1)) {
+  if (is_ggplot(..1)) {
     plots <- list(...)
   } else if (is.list(..1)) {
     plots <- ..1

R/plot_patchwork.R

@@ -94,7 +94,7 @@ names.patchwork <- function(x) NULL
     cli_abort('Patchworks can only be indexed with numeric indices')
   }
 
-  if (!is.ggplot(value)) {
+  if (!is_ggplot(value)) {
     value <- wrap_elements(value)
   }
   n_patches <- length(x$patches$plots)