fix(select): fixes Select bug that caused fwChange not to be fired …

…for last multi-select option fix #68
freshworks · May 6, 2020 · 650c205 · 650c205
1 parent b0b7c16
commit 650c205
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -120,7 +120,7 @@
     "hooks": {
       "pre-push": "npm run test",
       "prepare-commit-msg": "exec < /dev/tty && git cz --hook || true",
-      "pre-commit": "lint-staged"
+      "pre-commit": "lint-staged && npm run test"
     }
   },
   "lint-staged": {

diff --git a/src/components/select/select.stories.mdx b/src/components/select/select.stories.mdx
@@ -41,7 +41,7 @@ import { Meta, Story, Preview, Props } from "@storybook/addon-docs/blocks";
     <fw-select multiple label="Select the GOT house" state-text="Choose the house where you belong" required="true">
         <fw-select-option value="1">Starks</fw-select-option>
         <fw-select-option value="2">Lannisters</fw-select-option>
-        <fw-select-option value="3" selected disabled>Sand</fw-select-option>
+        <fw-select-option value="3" selected>Sand</fw-select-option>
         <fw-select-option value="4">Greyjoys</fw-select-option>
         <fw-select-option value="5">Tyrell</fw-select-option>
     </fw-select>

diff --git a/src/components/select/select.tsx b/src/components/select/select.tsx
@@ -133,7 +133,6 @@ export class Select {
 
   @Watch('options')
   optionsChangedHandler() {
-
     this.renderInput();
   }
 
@@ -179,6 +178,8 @@ export class Select {
     if (selectedOptions.length > 0) {
       this.value = this.multiple ? selectedOptions.map(option => option.value) : selectedOptions[0].value || '';
       this.selectInput.value = this.multiple ? '' : selectedOptions[0].text || '';
+    } else if (selectedOptions.length === 0) {
+      this.value = undefined;
     }
   }