Bug fix: Select prop value does not return correct type (#160)

* Bug fix: `Select` prop `value` does not return correct type
equinor · Sep 10, 2021 · f35bddb · f35bddb
1 parent d94aa36
commit f35bddb
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   [#157](https://github.com/equinor/webviz-core-components/pull/157) - Added utf8 encoding to Python's open() calls.
 -   [#158](https://github.com/equinor/webviz-core-components/pull/158) - Fixed error messages when contact person details not provided to `WebvizPluginPlaceholder`.
 -   [#159](https://github.com/equinor/webviz-core-components/pull/159) - Call `revokeObjectURL` after using `createObjectURL` in `WebvizPluginPlaceholder`.
+-   [#160](https://github.com/equinor/webviz-core-components/pull/160) - Bug fix: `Select` property `value` does not return correct type.
 
 ## [0.5.1] - 2021-07-12
 

diff --git a/react/src/lib/components/Select/Select.tsx b/react/src/lib/components/Select/Select.tsx
@@ -8,7 +8,10 @@
 import React from "react";
 import PropTypes, { InferProps } from "prop-types";
 
-import { getPropsWithMissingValuesSetToDefault, Optionals } from "../../utils/DefaultPropsHelpers";
+import {
+    getPropsWithMissingValuesSetToDefault,
+    Optionals,
+} from "../../utils/DefaultPropsHelpers";
 import "./Select.css";
 
 const propTypes = {
@@ -29,14 +32,20 @@ const propTypes = {
             /**
              * The dropdown's label
              */
-            label: PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.number.isRequired]).isRequired,
+            label: PropTypes.oneOfType([
+                PropTypes.string.isRequired,
+                PropTypes.number.isRequired,
+            ]).isRequired,
 
             /**
              * The value of the dropdown. This value
              * corresponds to the items specified in the
              * `value` property.
              */
-            value: PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.number.isRequired]).isRequired,
+            value: PropTypes.oneOfType([
+                PropTypes.string.isRequired,
+                PropTypes.number.isRequired,
+            ]).isRequired,
         }).isRequired
     ),
     /**
@@ -51,8 +60,11 @@ const propTypes = {
         PropTypes.string.isRequired,
         PropTypes.number.isRequired,
         PropTypes.arrayOf(
-            PropTypes.string.isRequired
-        ),
+            PropTypes.oneOfType([
+                PropTypes.string.isRequired,
+                PropTypes.number.isRequired,
+            ]).isRequired
+        ).isRequired,
     ]),
     /**
      * If true, the user can select multiple values
@@ -120,13 +132,17 @@ const defaultProps: Optionals<InferProps<typeof propTypes>> = {
     persistence: false,
     persisted_props: ["value"],
     persistence_type: "local",
-    setProps: (): void => { return; }
+    setProps: (): void => {
+        return;
+    },
 };
 
 /**
-* Select is a dash wrapper for the html select tag.
-*/
-const Select: React.FC<InferProps<typeof propTypes>> = (props: InferProps<typeof propTypes>): JSX.Element => {
+ * Select is a dash wrapper for the html select tag.
+ */
+const Select: React.FC<InferProps<typeof propTypes>> = (
+    props: InferProps<typeof propTypes>
+): JSX.Element => {
     const {
         id,
         parent_className,
@@ -137,17 +153,27 @@ const Select: React.FC<InferProps<typeof propTypes>> = (props: InferProps<typeof
         className,
         style,
         options,
-        setProps
+        setProps,
     } = getPropsWithMissingValuesSetToDefault(props, defaultProps);
 
     const handleChange = (e: React.ChangeEvent) => {
-        const options = (e.target as HTMLSelectElement).selectedOptions;
-        const values: string[] = [];
+        const selectedOptions = [].slice.call(
+            (e.target as HTMLSelectElement).selectedOptions
+        );
+        const values: (string | number)[] = [];
+
         for (let i = 0; i < options.length; i++) {
-            values.push(options[i].value);
+            if (
+                selectedOptions.some(
+                    (el: HTMLOptionElement) =>
+                        el.value === options[i].value.toString()
+                )
+            ) {
+                values.push(options[i].value);
+            }
         }
         setProps({ value: values });
-    }
+    };
 
     return (
         <div
@@ -156,7 +182,15 @@ const Select: React.FC<InferProps<typeof propTypes>> = (props: InferProps<typeof
             style={parent_style ? parent_style : {}}
         >
             <select
-                value={value ? value : ""}
+                value={
+                    value
+                        ? typeof value === "string" || typeof value === "number"
+                            ? value
+                            : (value as (string | number)[]).map((el) =>
+                                  el.toString()
+                              )
+                        : ""
+                }
                 multiple={multi}
                 size={size}
                 onChange={(e) => handleChange(e)}
@@ -165,15 +199,18 @@ const Select: React.FC<InferProps<typeof propTypes>> = (props: InferProps<typeof
             >
                 {options.map((opt, idx) => {
                     return (
-                        <option key={idx.toString() + opt.value} value={opt.value}>
+                        <option
+                            key={idx.toString() + opt.value}
+                            value={opt.value}
+                        >
                             {opt.label}
                         </option>
                     );
                 })}
             </select>
         </div>
     );
-}
+};
 
 export default Select;