Close #639: allow non tag() object to be used for a nav_panel()/nav_m…

…enu() icon
rstudio · Jun 20, 2023 · 3574379 · 3574379
1 parent 6abfd6c
commit 3574379
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/R/navs-legacy.R b/R/navs-legacy.R
@@ -314,7 +314,7 @@ tabPanel_ <- function(title, ..., value = title, icon = NULL) {
     `data-value` = value,
     # Here for legacy reasons
     # https://github.com/cran/miniUI/blob/74c87d/R/layout.R#L395
-    `data-icon-class` = tagGetAttribute(icon, "class"),
+    `data-icon-class` = if (inherits(icon, "shiny.tag")) tagGetAttribute(icon, "class"),
     ...
   )
   attr(pane, "_shiny_icon") <- icon
@@ -439,22 +439,16 @@ findAndMarkSelectedTab <- function(tabs, selected, foundSelected) {
 }
 
 prepTabIcon <- function(x = NULL) {
-  if (is.null(x)) return(NULL)
-  if (!inherits(x, "shiny.tag")) {
-    stop(
-      "`icon` must be a `shiny.tag` object. ",
-      "Try passing `icon()` (or `tags$i()`) to the `icon` parameter.",
-      call. = FALSE
-    )
-  }
 
-  is_fa <- grepl("fa-", tagGetAttribute(x, "class") %||% "", fixed = TRUE)
-  if (!is_fa) {
-    return(x)
+  if (inherits(x, "shiny.tag")) {
+    is_fa <- grepl("fa-", tagGetAttribute(x, "class") %||% "", fixed = TRUE)
+    if (is_fa) {
+      # specify fixed-width for font-awesome
+      x <- tagAppendAttributes(x, class = "fa-fw")
+    }
   }
 
-  # for font-awesome we specify fixed-width
-  tagAppendAttributes(x, class = "fa-fw")
+  x
 }
 
 # Text filter for navbarMenu's (plain text) separators