v1.11.1 release candidate (#4245)

* v1.11.1 release candidate

* `yarn build` (GitHub Actions)

* Revert actionButton()/actionLink() implementation to v1.11.0's behavior (re-introducing #4239)

* Minimal fix to address the regression in #4239

Ideally we'd fix this issue, and also get updateActionButton() working with HTML labels, but thanks to today's release of kinesis (which snapshots all of actionButton()s markup), and CRAN dragging their feet to accept our original submission (which was fine, by the way), we can't have nice things

* `yarn build` (GitHub Actions)

---------

Co-authored-by: cpsievert <[email protected]>

Author: cpsievert

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.11.0.9000
+Version: 1.11.1
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-1576-2126")),
     person("Joe", "Cheng", role = "aut", email = "[email protected]"),
@@ -202,7 +202,6 @@ Collate:
     'test.R'
     'update-input.R'
     'utils-lang.R'
-    'utils-tags.R'
     'version_bs_date_picker.R'
     'version_ion_range_slider.R'
     'version_jquery.R'

NEWS.md

@@ -1,17 +1,12 @@
-# shiny (development version)
+# shiny 1.11.1
 
-## New features
-
-* The `icon` argument of `actionButton()`, `downloadButton()`, etc. now accepts values other than `shiny::icon()` (like `fontawesome::fa()` and `bsicons::bs_icon()`). (#4242)
-
-## Improvements
+This is a patch release primarily for addressing the bugs introduced in v1.11.0.
 
-* Padding is now provided between the `icon` and `label` of an `actionButton()`. (#4242)
 ## Bug fixes
 
-* Fixed a regression in v1.11.0 where `InputBinding` implementations that don't pass a value to their `subscribe` callback were no longer notifying Shiny of input changes. (#4243)
+* Fixed an issue where `InputBinding` implementations that don't pass a value to their `subscribe` callback were no longer notifying Shiny of input changes. (#4243)
 
-* `updateActionButton()` and `updateActionLink()` once again handle `label` updates correctly (which can now include HTML). (#4242)
+* `updateActionButton()` and `updateActionLink()` once again handle `label` updates correctly. (#4245)
 
 # shiny 1.11.0
 

R/input-action.R

@@ -56,14 +56,13 @@ actionButton <- function(inputId, label, icon = NULL, width = NULL,
 
   value <- restoreInput(id = inputId, default = NULL)
 
-  tags$button(
-    id = inputId,
+  tags$button(id=inputId,
     style = css(width = validateCssUnit(width)),
-    type = "button",
-    class = "btn btn-default action-button",
+    type="button",
+    class="btn btn-default action-button",
     `data-val` = value,
     disabled = if (isTRUE(disabled)) NA else NULL,
-    get_action_children(label, icon),
+    list(validateIcon(icon), label),
     ...
   )
 }
@@ -73,52 +72,30 @@ actionButton <- function(inputId, label, icon = NULL, width = NULL,
 actionLink <- function(inputId, label, icon = NULL, ...) {
   value <- restoreInput(id = inputId, default = NULL)
 
-  tags$a(
-    id = inputId,
-    href = "#",
-    class = "action-button",
+  tags$a(id=inputId,
+    href="#",
+    class="action-button",
     `data-val` = value,
-    get_action_children(label, icon),
+    list(validateIcon(icon), label),
     ...
   )
 }
 
-get_action_children <- function(label, icon) {
-  icon <- validateIcon(icon)
 
-  if (length(icon) > 0) {
-    # The separator elements helps us distinguish between the icon and label
-    # when dynamically updating the button/link. Ideally, we would wrap each
-    # in a container element, but is currently done with a separator to help
-    # minimize the chance of breaking existing code.
-    tagList(
-      icon,
-      tags$span(class = "shiny-icon-separator"),
-      label
-    )
-  } else {
-    # Technically, we don't need the `icon` here, but keeping it maintains
-    # backwards compatibility of `btn$children[[1]][[2]]` to get the label.
-    # The shinyGovstyle package is at least one example of this.
-    tagList(icon, label)
-  }
-}
-
-# Throw an informative warning if icon isn't html-ish
+# Check that the icon parameter is valid:
+# 1) Check  if the user wants to actually add an icon:
+#    -- if icon=NULL, it means leave the icon unchanged
+#    -- if icon=character(0), it means don't add an icon or, more usefully,
+#       remove the previous icon
+# 2) If so, check that the icon has the right format (this does not check whether
+# it is a *real* icon - currently that would require a massive cross reference
+# with the "font-awesome" and the "glyphicon" libraries)
 validateIcon <- function(icon) {
-  if (length(icon) == 0) {
+  if (is.null(icon) || identical(icon, character(0))) {
     return(icon)
+  } else if (inherits(icon, "shiny.tag") && icon$name == "i") {
+    return(icon)
+  } else {
+    stop("Invalid icon. Use Shiny's 'icon()' function to generate a valid icon")
   }
-
-  if (!isTagLike(icon)) {
-    rlang::warn(
-      c(
-        "It appears that a non-HTML value was provided to `icon`.",
-        i = "Try using a `shiny::icon()` (or an equivalent) to get an icon."
-      ),
-      class = "shiny-validate-icon"
-    )
-  }
-
-  icon
 }

R/update-input.R

@@ -181,22 +181,14 @@ updateCheckboxInput <- function(session = getDefaultReactiveDomain(), inputId, l
 updateActionButton <- function(session = getDefaultReactiveDomain(), inputId, label = NULL, icon = NULL, disabled = NULL) {
   validate_session_object(session)
 
-  message <- dropNulls(list(
-    label = if (!is.null(label)) processDeps(label, session),
-    icon = if (!is.null(icon)) processDeps(validateIcon(icon), session),
-    disabled = disabled
-  ))
+  if (!is.null(icon)) icon <- as.character(validateIcon(icon))
+  message <- dropNulls(list(label=label, icon=icon, disabled=disabled))
   session$sendInputMessage(inputId, message)
 }
 #' @rdname updateActionButton
 #' @export
 updateActionLink <- function(session = getDefaultReactiveDomain(), inputId, label = NULL, icon = NULL) {
-  updateActionButton(
-    session,
-    inputId = inputId,
-    label = label,
-    icon = icon
-  )
+  updateActionButton(session, inputId=inputId, label=label, icon=icon)
 }