Modify icon() function to call fontawesome::fa_i() for equivalent functionality

DESCRIPTION

@@ -44,8 +44,6 @@ Authors@R: c(
     comment = "Bootstrap-datepicker library"),
     person("Andrew", "Rowls", role = c("ctb", "cph"),
     comment = "Bootstrap-datepicker library"),
-    person("Dave", "Gandy", role = c("ctb", "cph"),
-    comment = "Font-Awesome font"),
     person("Brian", "Reavis", role = c("ctb", "cph"),
     comment = "selectize.js library"),
     person("Salmen", "Bejaoui", role = c("ctb", "cph"),
@@ -80,6 +78,7 @@ Imports:
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
+    fontawesome,
     htmltools (>= 0.5.0.9001),
     R6 (>= 2.0),
     sourcetools,
@@ -113,6 +112,8 @@ Suggests:
     ragg,
     showtext,
     sass
+Remotes:
+    rstudio/fontawesome
 URL: https://shiny.rstudio.com/
 BugReports: https://github.com/rstudio/shiny/issues
 Collate:
@@ -134,7 +135,6 @@ Collate:
     'devmode.R'
     'diagnose.R'
     'fileupload.R'
-    'font-awesome.R'
     'graph.R'
     'reactives.R'
     'reactive-domains.R'

R/bootstrap.R

@@ -1492,78 +1492,79 @@ downloadLink <- function(outputId, label="Download", class=NULL, ...) {
 #' Create an icon
 #'
 #' Create an icon for use within a page. Icons can appear on their own, inside
-#' of a button, or as an icon for a [tabPanel()] within a
-#' [navbarPage()].
-#'
-#' @param name Name of icon. Icons are drawn from the
-#'   [Font Awesome Free](https://fontawesome.com/) (currently icons from
-#'   the v5.13.0 set are supported with the v4 naming convention) and
-#'   [Glyphicons](https://getbootstrap.com/components/#glyphicons)
-#'   libraries. Note that the "fa-" and "glyphicon-" prefixes should not be used
-#'   in icon names (i.e. the "fa-calendar" icon should be referred to as
-#'   "calendar")
-#' @param class Additional classes to customize the style of the icon (see the
+#' of a button, or as an icon for a [tabPanel()] within a [navbarPage()].
+#'
+#' @param name The name of the icon. Icons are drawn from the [Font Awesome
+#'   Free](https://fontawesome.com/) (currently icons from the v5.13.0 set are
+#'   supported with the v4 naming convention) and
+#'   [Glyphicons](https://getbootstrap.com/docs/3.3/components/#glyphicons)
+#'   libraries. Note that the `"fa-"` and `"glyphicon-"` prefixes should not be
+#'   used in icon names (i.e. the `"fa-calendar"` icon should be referred to as
+#'   `"calendar"`).
+#' @param class Additional classes to customize the style of an icon (see the
 #'   [usage examples](https://fontawesome.com/how-to-use) for details on
 #'   supported styles).
-#' @param lib Icon library to use ("font-awesome" or "glyphicon")
-#' @param ... Arguments passed to the `<i>` tag of [htmltools::tags]
+#' @param lib The icon library to use. If drawing from the Font Awesome library
+#'   of icons, this should be `"font-awesome"`. The other option is or
+#'   `"glyphicon"` to use icons from the Glyphicons library.
+#' @param ... Arguments passed to the `<i>` tag of [htmltools::tags].
 #'
-#' @return An icon element
+#' @return An icon element.
 #'
 #' @seealso For lists of available icons, see
 #'   [https://fontawesome.com/icons](https://fontawesome.com/icons) and
-#'   [https://getbootstrap.com/components/#glyphicons](https://getbootstrap.com/components/#glyphicons).
-#'
+#'   [https://getbootstrap.com/docs/3.3/components/#glyphicons](https://getbootstrap.com/docs/3.3/components/#glyphicons).
 #'
 #' @examples
 #' # add an icon to a submit button
-#' submitButton("Update View", icon = icon("refresh"))
+#' submitButton("Update View", icon = icon("redo"))
 #'
 #' navbarPage("App Title",
 #'   tabPanel("Plot", icon = icon("bar-chart-o")),
 #'   tabPanel("Summary", icon = icon("list-alt")),
 #'   tabPanel("Table", icon = icon("table"))
 #' )
 #' @export
-icon <- function(name, class = NULL, lib = "font-awesome", ...) {
+icon <- function(name,
+                 class = NULL,
+                 lib = "font-awesome",
+                 ...) {
+
   prefixes <- list(
     "font-awesome" = "fa",
     "glyphicon" = "glyphicon"
   )
   prefix <- prefixes[[lib]]
 
-  # determine stylesheet
+  # Stop function if `lib` value is not allowed
   if (is.null(prefix)) {
-    stop("Unknown font library '", lib, "' specified. Must be one of ",
-         paste0('"', names(prefixes), '"', collapse = ", "))
+    stop(
+      "Unknown font library '", lib, "' specified. Must be one of ",
+      paste0('"', names(prefixes), '"', collapse = ", "),
+      call. = FALSE
+    )
+  }
+
+  # Use the `fontawesome::fa_i()` function for FontAwesome icons
+  # with font-awesome
+  if (lib == "font-awesome") {
+    return(fontawesome::fa_i(name = name, class = class, ...))
   }
 
   # build the icon class (allow name to be null so that other functions
   # e.g. buildTabset can pass an explicit class value)
   iconClass <- ""
   if (!is.null(name)) {
     prefix_class <- prefix
-    if (prefix_class == "fa" && name %in% font_awesome_brands) {
-      prefix_class <- "fab"
-    }
     iconClass <- paste0(prefix_class, " ", prefix, "-", name)
   }
-  if (!is.null(class))
+
+  if (!is.null(class)) {
     iconClass <- paste(iconClass, class)
+  }
 
   iconTag <- tags$i(class = iconClass, role = "presentation", `aria-label` = paste(name, "icon"), ...)
 
-  # font-awesome needs an additional dependency (glyphicon is in bootstrap)
-  if (lib == "font-awesome") {
-    htmlDependencies(iconTag) <- htmlDependency(
-      "font-awesome", "5.13.0", "www/shared/fontawesome", package = "shiny",
-      stylesheet = c(
-        "css/all.min.css",
-        "css/v4-shims.min.css"
-      )
-    )
-  }
-
   htmltools::browsable(iconTag)
 }