Update selectInput's binding to use selectize.js' getValue() method…

… when relevant (#3926) Co-authored-by: cpsievert <cpsievert@users.noreply.github.com>
rstudio · Oct 26, 2023 · 77bc4e9 · 77bc4e9
1 parent a1b9fda
commit 77bc4e9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/inst/www/shared/shiny.js b/inst/www/shared/shiny.js
@@ -8818,7 +8818,12 @@
     }, {
       key: "getValue",
       value: function getValue(el) {
-        return (0, import_jquery15.default)(el).val();
+        if (!isSelectize(el)) {
+          return (0, import_jquery15.default)(el).val();
+        } else {
+          var selectize = this._selectize(el);
+          return selectize === null || selectize === void 0 ? void 0 : selectize.getValue();
+        }
       }
     }, {
       key: "setValue",

diff --git a/inst/www/shared/shiny.js.map b/inst/www/shared/shiny.js.map
diff --git a/inst/www/shared/shiny.min.js b/inst/www/shared/shiny.min.js
diff --git a/inst/www/shared/shiny.min.js.map b/inst/www/shared/shiny.min.js.map
diff --git a/srcts/src/bindings/input/selectInput.ts b/srcts/src/bindings/input/selectInput.ts
@@ -2,7 +2,6 @@ import $ from "jquery";
 import { InputBinding } from "./inputBinding";
 import { $escape, hasDefinedProperty, updateLabel } from "../../utils";
 import { indirectEval } from "../../utils/eval";
-import type { NotUndefined } from "../../utils/extraTypes";
 
 type SelectHTMLElement = HTMLSelectElement & { nonempty: boolean };
 
@@ -61,10 +60,14 @@ class SelectInputBinding extends InputBinding {
   getId(el: SelectHTMLElement): string {
     return InputBinding.prototype.getId.call(this, el) || el.name;
   }
-  getValue(
-    el: HTMLElement
-  ): NotUndefined<ReturnType<JQuery<HTMLElement>["val"]>> {
-    return $(el).val() as NotUndefined<ReturnType<JQuery<HTMLElement>["val"]>>;
+  getValue(el: SelectHTMLElement): any {
+    if (!isSelectize(el)) {
+      return $(el).val();
+    } else {
+      const selectize = this._selectize(el);
+
+      return selectize?.getValue();
+    }
   }
   setValue(el: SelectHTMLElement, value: string): void {
     if (!isSelectize(el)) {

diff --git a/srcts/types/src/bindings/input/selectInput.d.ts b/srcts/types/src/bindings/input/selectInput.d.ts
@@ -1,6 +1,5 @@
 /// <reference types="selectize" />
 import { InputBinding } from "./inputBinding";
-import type { NotUndefined } from "../../utils/extraTypes";
 type SelectHTMLElement = HTMLSelectElement & {
     nonempty: boolean;
 };
@@ -19,7 +18,7 @@ declare class SelectInputBinding extends InputBinding {
     find(scope: HTMLElement): JQuery<HTMLElement>;
     getType(el: HTMLElement): string | null;
     getId(el: SelectHTMLElement): string;
-    getValue(el: HTMLElement): NotUndefined<ReturnType<JQuery<HTMLElement>["val"]>>;
+    getValue(el: SelectHTMLElement): any;
     setValue(el: SelectHTMLElement, value: string): void;
     getState(el: SelectHTMLElement): {
         label: JQuery<HTMLElement>;