Let the client handle supplying and retaining default plugins

Author: cpsievert

shiny/ui/_input_select.py

@@ -9,9 +9,8 @@
     "input_select",
     "input_selectize",
 )
-import copy
-from json import dumps
-from typing import Any, Mapping, Optional, Union, cast
+import json
+from typing import Mapping, Optional, Union, cast
 
 from htmltools import Tag, TagChild, TagList, css, div, tags
 
@@ -263,7 +262,6 @@ def _input_select_impl(
         options = {}
 
     plugins = _get_default_plugins(remove_button, multiple, choices_)
-    options = _add_default_plugins(options, plugins)
 
     choices_tags = _render_choices(choices_, selected)
 
@@ -278,19 +276,16 @@ def _input_select_impl(
                 multiple=multiple,
                 size=size,
             ),
-            (
-                TagList(
-                    tags.script(
-                        dumps(options),
-                        type="application/json",
-                        data_for=resolved_id,
-                        data_eval=dumps(extract_js_keys(options)),
-                    ),
-                    selectize_deps(),
-                )
-                if selectize
-                else None
+            tags.script(
+                json.dumps(options),
+                type="application/json",
+                data_for=resolved_id,
+                # Which option values should be interpreted as JS?
+                data_eval=json.dumps(extract_js_keys(options)),
+                # Supply and retain these plugins across updates (on the client)
+                data_default_plugins=json.dumps(plugins),
             ),
+            selectize_deps() if selectize else None,
         ),
         class_="form-group shiny-input-container",
         style=css(width=width),
@@ -317,18 +312,6 @@ def _get_default_plugins(
     return ()
 
 
-def _add_default_plugins(
-    options: dict[str, Any], default_plugins: tuple[str, ...]
-) -> dict[str, Any]:
-    opts = copy.deepcopy(options)
-    p: list[str] = opts.get("plugins", [])
-    if not isinstance(p, list):
-        raise TypeError("`options['plugins']` must be a list.")
-    p.extend(default_plugins)
-    opts["plugins"] = p
-    return opts
-
-
 def _normalize_choices(x: SelectChoicesArg) -> _SelectChoices:
     if x is None:
         raise TypeError("`choices` must be a list, tuple, or dict.")

shiny/ui/_input_update.py

@@ -36,12 +36,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,
-    _add_default_plugins,
-    _normalize_choices,
-    _render_choices,
-)
+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
 
@@ -769,20 +764,22 @@ def update_selectize(
 
     session = require_active_session(session)
 
-    if remove_button:
-        options = _add_default_plugins(options or {}, ("remove_button", "clear_button"))
-
-    if options is not None:
-        if remove_button is None:
-            # clear_button is problematic when multiple=False
-            # and there is no empty choice
-            options = _add_default_plugins(options, ("remove_button",))
+    # Unless specified otherwise, the default plugins are retained
+    # across updates (by the client)
+    default_plugins = None
+    if remove_button is True:
+        default_plugins = json.dumps(["remove_button", "clear_button"])
+    if remove_button is False:
+        default_plugins = json.dumps([])
 
+    if options is not None or default_plugins is not None:
+        options = options or {}
         cfg = tags.script(
             json.dumps(options),
             type="application/json",
             data_for=resolve_id(id),
             data_eval=json.dumps(extract_js_keys(options)),
+            data_default_plugins=default_plugins,
         )
         session.send_input_message(id, {"config": cfg.get_html_string()})