Check for NULL earlier in input_provided()

DESCRIPTION

@@ -19,7 +19,7 @@ Imports:
     htmltools (>= 0.5.1.1),
     rlang (>= 0.4.10),
     glue (>= 1.4.2)
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.3
 Roxygen: list(markdown = TRUE)
 Suggests:
     testthat,

R/rules.R

@@ -271,6 +271,8 @@ sv_regex <- function(pattern,
 #' @param message The validation error message to use if a value doesn't match a
 #'   regex pattern for email address detection.
 #' @inheritParams sv_numeric
+#' @param allow_na If `FALSE`, then any `NA` element will cause validation to 
+#'   fail.
 #'
 #' @return A function suitable for use as an
 #'   [`InputValidator$add_rule()`][InputValidator] rule.
@@ -353,7 +355,7 @@ sv_email <- function(message = "Not a valid email address",
 #'
 #' @param message The validation error message to use if a value doesn't match a
 #'   regex pattern for URL detection.
-#' @inheritParams sv_numeric
+#' @inheritParams sv_email
 #'
 #' @return A function suitable for use as an
 #'   [`InputValidator$add_rule()`][InputValidator] rule.

R/validator.R

@@ -443,14 +443,12 @@ input_provided <- function(val) {
   # * FALSE (or a logical vector containing only FALSEs) is not truthy, but it
   #   is provided.
 
+  if (is.null(val))
+    return(FALSE)
   if (inherits(val, 'try-error'))
     return(FALSE)
-
   if (!is.atomic(val))
     return(TRUE)
-
-  if (is.null(val))
-    return(FALSE)
   if (length(val) == 0)
     return(FALSE)
   if (all(is.na(val)))

tests/testthat/test-validator.R

@@ -23,6 +23,10 @@ test_that("InputValidator cannot be constructed without a session", {
 })
 
 test_that("InputValidator add_rule()", {
+  if (packageVersion("shiny") <= "1.7.5" && getRversion() > "4.3.1") {
+    skip("Skipping InputValidator add_rule() tests since shiny::need doesn't work as intended.")
+  }
+
   session <- shiny::MockShinySession$new()
   shiny::withReactiveDomain(session, {
     iv <- InputValidator$new()