Update ggplot2 inheritance helpers

Author: arcresu

NAMESPACE

@@ -39,6 +39,7 @@ importFrom(ggplot2,aes)
 importFrom(ggplot2,autoplot)
 importFrom(ggplot2,ggplot_build)
 importFrom(ggplot2,ggplot_gtable)
+importFrom(ggplot2,is_waiver)
 importFrom(ggplot2,rel)
 importFrom(ggplot2,waiver)
 importFrom(grid,unit)

R/phylepic-package.R

@@ -3,6 +3,7 @@
 
 ## usethis namespace: start
 #' @importFrom ggplot2 waiver
+#' @importFrom ggplot2 is_waiver
 #' @importFrom ggplot2 aes
 #' @importFrom grid unit
 #' @importFrom rlang .data

R/vnd_ggplot2_bin.R

@@ -136,15 +136,15 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =
                          center = NULL, boundary = NULL,
                          closed = c("right", "left")) {
 
-  range <- if (is.scale(scale)) scale$dimension() else range(x)
+  range <- if (ggplot2::is_scale(scale)) scale$dimension() else range(x)
   #@ check_length(range, 2L)
 
   if (!is.null(breaks)) {
     breaks <- allow_lambda(breaks)
     if (is.function(breaks)) {
       breaks <- breaks(x)
     }
-    if (is.scale(scale) && !scale$is_discrete()) {
+    if (ggplot2::is_scale(scale) && !scale$is_discrete()) {
       breaks <- scale$transform(breaks)
     }
     #@ check_numeric(breaks)

R/vnd_ggplot2_utils.R

@@ -20,10 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-is_waiver <- function(x) {
-  inherits(x, "waiver")
-}
-
 ggname <- function(prefix, grob) {
   grob$name <- grid::grobName(grob, prefix)
   grob
@@ -52,5 +48,3 @@ dual_param <- function(x, default = list(x = NULL, y = NULL)) {
 allow_lambda <- function(x) {
   if (rlang::is_formula(x)) rlang::as_function(x) else x
 }
-
-is.scale <- function(x) inherits(x, "Scale")