Update to latest action button/link markup

Author: cpsievert

shiny/_versions.py

@@ -1,4 +1,4 @@
-shiny_html_deps = "1.11.0.9000"
+shiny_html_deps = "1.11.1.9000"
 bslib = "0.9.0.9000"
 htmltools = "0.5.8.9000"
 bootstrap = "5.3.1"

shiny/ui/_input_action_button.py

@@ -61,18 +61,15 @@ def input_action_button(
     if "_add_ws" not in kwargs:
         kwargs["_add_ws"] = True
 
+    if icon is not None:
+        icon = tags.span(icon, class_="action-icon")
+
+    if label is not None:
+        label = tags.span(label, class_="action-label")
+
     return tags.button(
         {"class": "btn btn-default action-button", "style": css(width=width)},
         icon,
-        # The separator element helps us distinguish between the icon and label
-        # when dynamically updating the button/link (see rstudio/shiny#4242)
-        tags.span(class_="shiny-icon-separator") if icon else None,
-        # Adds a space between the icon and label
-        # TODO: this space gets removed when icon/label are updated dynamically,
-        # which is not ideal. The 'right' way to do this would be to either
-        # add a CSS class to the separator element, or wrap both the icon and
-        # label in a container element.
-        " " if icon and label else None,
         label,
         id=resolve_id(id),
         type="button",
@@ -122,12 +119,15 @@ def input_action_link(
     * :func:`~shiny.reactive.event`
     """
 
+    if icon is not None:
+        icon = tags.span(icon, class_="action-icon")
+
+    if label is not None:
+        label = tags.span(label, class_="action-label")
+
     return tags.a(
-        {"class": "action-button"},
+        {"class": "action-button action-link"},
         icon,
-        # The separator element helps us distinguish between the icon and label
-        # when dynamically updating the button/link (see rstudio/shiny#4242)
-        tags.span(class_="shiny-icon-separator") if icon else None,
         label,
         id=resolve_id(id),
         href="#",

shiny/www/shared/_version.json

@@ -1,5 +1,5 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "shiny",
-  "version": "1.11.0.9000 (rstudio/shiny@460a93a5fdc1f152d2ec3d5741a01c2712676526)"
+  "version": "1.11.1.9000 (rstudio/shiny@ecf6bfe9a7696695c67c90fbf5901986a61c024c)"
 }

shiny/www/shared/bootstrap/_version.json

@@ -1,7 +1,7 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
-  "shiny_version": "1.11.0.9000 (rstudio/shiny@460a93a5fdc1f152d2ec3d5741a01c2712676526)",
-  "bslib_version": "0.9.0.9000 (rstudio/bslib@c707161125dc5646ce2b9990ab474b7cedaef920)",
+  "shiny_version": "1.11.1.9000 (rstudio/shiny@ecf6bfe9a7696695c67c90fbf5901986a61c024c)",
+  "bslib_version": "0.9.0.9000 (rstudio/bslib@9562108e40a0bffb4a7c8709c2963509435c5c0f)",
   "htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
   "bootstrap_version": "5.3.1"
 }

shiny/www/shared/bootstrap/bootstrap.min.css

@@ -1,5 +1,5 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "bslib",
-  "version": "0.9.0.9000 (rstudio/bslib@c707161125dc5646ce2b9990ab474b7cedaef920)"
+  "version": "0.9.0.9000 (rstudio/bslib@9562108e40a0bffb4a7c8709c2963509435c5c0f)"
 }