Don't get functions from shiny's namespace

Fixes #22
gadenbuie · Jan 28, 2021 · 34131ab · 34131ab
1 parent 23f0a2f
commit 34131ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -27,6 +27,8 @@
 
 * `regexplain_gadget()` now also returns the built regexp directly, enabling
   usage like `pattern <- regexplain_gadget()`.
+
+* Fixed an issue with `shiny` version 1.6 (thanks @jthomasmock, #22)
 
 ### 0.2.2
 

diff --git a/R/shiny_modified_inputs.R b/R/shiny_modified_inputs.R
@@ -24,8 +24,6 @@ textAreaInputAlt <- function(
   resize = NULL,
   is_code = TRUE
 ) {
-  `%AND%` <- getFromNamespace("%AND%", "shiny")
-
   value <- shiny::restoreInput(id = inputId, default = value)
 
   if (!is.null(resize)) {
@@ -50,7 +48,7 @@ textAreaInputAlt <- function(
 
   shiny::div(
     class = "form-group shiny-input-container",
-    label %AND% shiny::tags$label(label, `for` = inputId),
+    tags$label(label, `for` = inputId),
     style = if (!parent_style %in% c(" ", "", "  ")) parent_style,
     shiny::tags$textarea(
       id = inputId,
@@ -86,13 +84,12 @@ textInputCode <- function(
   placeholder = NULL,
   ...
 ) {
-  `%AND%` <- getFromNamespace("%AND%", "shiny")
   value <- shiny::restoreInput(id = inputId, default = value)
 
   shiny::div(
     class = "input-group shiny-input-container",
     style = if (!is.null(width)) paste0("width: ", shiny::validateCssUnit(width), ";"),
-    label %AND% shiny::tags$label(label, `for` = inputId),
+    tags$label(label, `for` = inputId),
     shiny::tags$input(
       id = inputId,
       type = "text",