scale_x/y_facet use quosures

NEWS.md

@@ -1,5 +1,7 @@
 # ggh4x (development version)
 
+* `scale_{x/y}_facet()` now use quosures instead of expressions (#101)
+
 # ggh4x 0.2.4
 
 This is a small release for compatibility with ggplot2 3.4.2, along with some

R/scale_facet.R

@@ -102,7 +102,7 @@ scale_facet <- function(expr, aes, ..., type = "continuous") {
     ))
   }
 
-  if (!rlang::is_expression(expr)) {
+  if (!rlang::is_quosure(expr) || quo_is_missing(expr)) {
     cli::cli_abort("{.arg expr} must be a valid {.cls expression}.")
   }
 
@@ -118,13 +118,13 @@ scale_facet <- function(expr, aes, ..., type = "continuous") {
 #' @export
 #' @rdname scale_facet
 scale_x_facet <- function(expr, ..., type = "continuous") {
-  scale_facet(expr = enexpr(expr), "x", ..., type = type)
+  scale_facet(expr = enquo(expr), "x", ..., type = type)
 }
 
 #' @export
 #' @rdname scale_facet
 scale_y_facet <- function(expr, ..., type = "continuous") {
-  scale_facet(expr = enexpr(expr), "y", ..., type = type)
+  scale_facet(expr = enquo(expr), "y", ..., type = type)
 }
 
 #' @export

tests/testthat/test-scale_facet.R

@@ -44,7 +44,7 @@ test_that("scale_(x/y)_facet can be added to a plot", {
   expect_length(p$facet$new_y_scales, 1L)
   expect_identical(
     attr(p$facet$new_y_scales, "lhs")[[1]],
-    rlang::expr(COL == 2)
+    rlang::quo(COL == 2)
   )
 
   p <- p + scale_y_facet(COL == 1, breaks = 1:40)
@@ -54,7 +54,7 @@ test_that("scale_(x/y)_facet can be added to a plot", {
   expect_length(attr(p$facet$new_y_scales, "lhs"), 2L)
   expect_identical(
     attr(p$facet$new_y_scales, "lhs")[[2]],
-    rlang::expr(COL == 1)
+    rlang::quo(COL == 1)
   )
 
   p <- p + scale_x_facet(PANEL == 3, limits = c(0, 500))