Move to a JSON-only approach

Author: cpsievert

shiny/ui/_input_select.py

@@ -273,6 +273,9 @@ def _input_select_impl(
     if remove_button is None:
         remove_button = multiple
 
+    # Add our own special remove_button option
+    options["shinyRemoveButton"] = str(remove_button).lower()
+
     selectize_config = None
     if selectize:
         selectize_config = tags.script(
@@ -282,8 +285,6 @@ def _input_select_impl(
             data_for=resolved_id,
             # Which option values should be interpreted as JS?
             data_eval=json.dumps(extract_js_keys(options)),
-            # Can be "both", "true", or "false"
-            data_remove_button=str(remove_button).lower(),
         )
 
     return div(
@@ -313,29 +314,6 @@ def _normalize_choices(x: SelectChoicesArg) -> _SelectChoices:
         return x
 
 
-# Translate remove_button into default selectize plugins
-# N.B. remove_button is primarily for multiple=True and clear_button is for
-# multiple=False, but both can also be useful in the multiple=True case (i.e., clear
-# _all_ selected items)
-def _get_default_plugins(
-    remove_button: Optional[Literal[True, False, "both"]],
-    multiple: bool,
-) -> Optional[str]:
-    if remove_button is None:
-        remove_button = multiple
-
-    if remove_button is False:
-        return None
-
-    if remove_button is True:
-        return json.dumps(["remove_button" if multiple else "clear_button"])
-
-    if remove_button == "both":
-        return json.dumps(["remove_button", "clear_button"])
-
-    raise ValueError(f"Invalid value for `remove_button`: {remove_button}")
-
-
 def _render_choices(
     x: _SelectChoices, selected: Optional[str | list[str]] = None
 ) -> TagList:

shiny/ui/_input_update.py

@@ -38,12 +38,7 @@
 from ..types import ActionButtonValue
 from ._input_check_radio import ChoicesArg, _generate_options
 from ._input_date import _as_date_attr
-from ._input_select import (
-    SelectChoicesArg,
-    _normalize_choices,
-    _render_choices,
-    _get_default_plugins,
-)
+from ._input_select import SelectChoicesArg, _normalize_choices, _render_choices
 from ._input_slider import SliderStepArg, SliderValueArg, _as_numeric, _slider_type
 from ._utils import JSEval, _session_on_flush_send_msg, extract_js_keys
 
@@ -771,14 +766,16 @@ def update_selectize(
 
     session = require_active_session(session)
 
-    if options is not None or remove_button is not None:
+    if remove_button is not None:
         options = options or {}
+        options["shinyRemoveButton"] = str(remove_button).lower()
+
+    if options is not None:
         cfg = tags.script(
             json.dumps(options),
             type="application/json",
             data_for=resolve_id(id),
             data_eval=json.dumps(extract_js_keys(options)),
-            data_remove_button=None if remove_button is None else str(remove_button),
         )
         session.send_input_message(id, {"config": cfg.get_html_string()})
 

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.1.9000 (rstudio/shiny@5f31f11fa7050125c0bef2cb693cf87142e1ee96)"
+  "version": "1.11.1.9000 (rstudio/shiny@a06da9871b27c9c1d2ca5f8b8c0c0f57c972ed2a)"
 }

shiny/www/shared/bootstrap/_version.json

@@ -1,6 +1,6 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
-  "shiny_version": "1.11.1.9000 (rstudio/shiny@5f31f11fa7050125c0bef2cb693cf87142e1ee96)",
+  "shiny_version": "1.11.1.9000 (rstudio/shiny@a06da9871b27c9c1d2ca5f8b8c0c0f57c972ed2a)",
   "bslib_version": "0.9.0.9000 (rstudio/bslib@9562108e40a0bffb4a7c8709c2963509435c5c0f)",
   "htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
   "bootstrap_version": "5.3.1"