Follow up to #4276: preserve shinyRemoveButton from previous config (if no new one is specified)

inst/www/shared/shiny.js

@@ -2267,8 +2267,11 @@
     }
     return (0, import_jquery19.default)(el).parent().parent().find('label[for="' + escapedId + '"]');
   }
+  function getConfigScript(el) {
+    return (0, import_jquery19.default)(el).parent().find('script[data-for="' + $escape(el.id) + '"]');
+  }
   function isSelectize(el) {
-    const config = (0, import_jquery19.default)(el).parent().find('script[data-for="' + $escape(el.id) + '"]');
+    const config = getConfigScript(el);
     return config.length > 0;
   }
   var SelectInputBinding = class extends InputBinding {
@@ -2331,7 +2334,15 @@
         this._selectize(el);
       }
       if (hasDefinedProperty(data, "config")) {
-        $el.parent().find('script[data-for="' + $escape(el.id) + '"]').replaceWith(data.config);
+        const oldConfig = getConfigScript(el);
+        const oldJSON = JSON.parse(oldConfig.html());
+        oldConfig.replaceWith(data.config);
+        const newConfig = getConfigScript(el);
+        const newJSON = JSON.parse(newConfig.html());
+        if (oldJSON.shinyRemoveButton !== void 0 && newJSON.shinyRemoveButton === void 0) {
+          newJSON.shinyRemoveButton = oldJSON.shinyRemoveButton;
+          newConfig.html(JSON.stringify(newJSON));
+        }
         this._selectize(el, true);
       }
       if (hasDefinedProperty(data, "url")) {
@@ -2404,7 +2415,7 @@
     _selectize(el, update = false) {
       if (!import_jquery19.default.fn.selectize) return void 0;
       const $el = (0, import_jquery19.default)(el);
-      const config = $el.parent().find('script[data-for="' + $escape(el.id) + '"]');
+      const config = getConfigScript(el);
       if (config.length === 0) return void 0;
       let options = import_jquery19.default.extend(
         {

srcts/src/bindings/input/selectInput.ts

@@ -43,13 +43,16 @@ function getLabelNode(el: SelectHTMLElement): JQuery<HTMLElement> {
     .parent()
     .find('label[for="' + escapedId + '"]');
 }
-// Return true if it's a selectize input, false if it's a regular select input.
 
-function isSelectize(el: HTMLElement): boolean {
-  const config = $(el)
+function getConfigScript(el: SelectHTMLElement): JQuery<HTMLScriptElement> {
+  return $(el)
     .parent()
     .find('script[data-for="' + $escape(el.id) + '"]');
+}
 
+// Return true if it's a selectize input, false if it's a regular select input.
+function isSelectize(el: SelectHTMLElement): boolean {
+  const config = getConfigScript(el);
   return config.length > 0;
 }
 
@@ -136,10 +139,28 @@ class SelectInputBinding extends InputBinding {
 
     // re-initialize selectize
     if (hasDefinedProperty(data, "config")) {
-      $el
-        .parent()
-        .find('script[data-for="' + $escape(el.id) + '"]')
-        .replaceWith(data.config!);
+      // Get current selectize 'config' (this holds the options argument from R/Python)
+      const oldConfig = getConfigScript(el);
+
+      // Before replacing the config, remember the old one since some values
+      // want to be sticky across updates
+      const oldJSON: SelectizeShinyOptions = JSON.parse(oldConfig.html());
+
+      // Replace the old config with the new one
+      oldConfig.replaceWith(data.config!);
+
+      // If shinyRemoveButton was present in the old but not the new config,
+      // keep the old value
+      const newConfig = getConfigScript(el);
+      const newJSON: SelectizeShinyOptions = JSON.parse(newConfig.html());
+      if (
+        oldJSON.shinyRemoveButton !== undefined &&
+        newJSON.shinyRemoveButton === undefined
+      ) {
+        newJSON.shinyRemoveButton = oldJSON.shinyRemoveButton;
+        newConfig.html(JSON.stringify(newJSON));
+      }
+
       this._selectize(el, true);
     }
 
@@ -252,9 +273,7 @@ class SelectInputBinding extends InputBinding {
     // Safe-guard against missing the selectize js library
     if (!$.fn.selectize) return undefined;
     const $el = $(el);
-    const config = $el
-      .parent()
-      .find('script[data-for="' + $escape(el.id) + '"]');
+    const config = getConfigScript(el);
 
     if (config.length === 0) return undefined;