Remove tab stop issue

mctekk · Jul 13, 2017 · fe05ff8 · fe05ff8
1 parent aedcfbb
commit fe05ff8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/lib/Multiselect.vue b/lib/Multiselect.vue
@@ -7,7 +7,6 @@
     @keydown.self.down.prevent="pointerForward()"
     @keydown.self.up.prevent="pointerBackward()"
     @keydown.enter.stop.prevent.self="addPointerElement()"
-    @keydown.tab.stop="addPointerElement()"
     @keyup.esc="deactivate()"
     class="multiselect">
       <div @mousedown.prevent="toggle()" class="multiselect__select"></div>
@@ -45,7 +44,6 @@
           @keyup.down="pointerForward()"
           @keyup.up="pointerBackward()"
           @keydown.enter.stop.prevent.self="addPointerElement()"
-          @keydown.tab.stop="addPointerElement()"
           @keydown.delete="removeLastElement()"
           class="multiselect__input"/>
           <span

diff --git a/lib/multiselectMixin.js b/lib/multiselectMixin.js
@@ -5,7 +5,9 @@ module.exports = {
     return {
       search: '',
       isOpen: false,
-      value: this.selected ? deepClone(this.selected) : this.multiple ? [] : null
+      value: this.selected || this.selected === 0
+        ? deepClone(this.selected)
+        : this.multiple ? [] : null
     }
   },
   props: {
@@ -142,7 +144,6 @@ module.exports = {
     customLabel: {
       type: Function,
       default (option, label) {
-        if (option && option.isTag) return option.label
         return label ? option[label] : option
       }
     },
@@ -223,8 +224,7 @@ module.exports = {
         : this.options
     },
     currentOptionLabel () {
-      const label = this.getOptionLabel(this.value)
-      return label ? label.toString() : ''
+      return this.getOptionLabel(this.value)
     }
   },
   watch: {
@@ -238,11 +238,11 @@ module.exports = {
     },
     'search' () {
       /* istanbul ignore else */
-      if (this.search !== this.currentOptionLabel) {
-        this.$emit('search-change', this.search, this.id)
-      }
+      if (this.search === this.currentOptionLabel) return
+
+      this.$emit('search-change', this.search, this.id)
     },
-    'selected' (newVal, oldVal) {
+    'selected' () {
       this.value = deepClone(this.selected)
     }
   },
@@ -287,19 +287,16 @@ module.exports = {
       return !this.isSelected(option)
     },
     /**
-     * Returns the option[this.label]
-     * if option is Object. Otherwise check for option.label.
-     * If non is found, return entrie option.
-     *
+     * Returns empty string when options is null/undefined
+     * Returns tag query if option is tag.
+     * Returns the customLabel() results and casts it to string.
      * @param  {Object||String||Integer} Passed option
      * @returns {Object||String}
      */
     getOptionLabel (option) {
-      if (typeof option === 'object' && option !== null) {
-        return this.customLabel(option, this.label)
-      } else {
-        return option ? this.customLabel(option) : ''
-      }
+      if (!option && option !== 0) return ''
+      if (option.isTag) return option.label
+      return this.customLabel(option, this.label) + ''
     },
     /**
      * Add the given option to the list of selected options

diff --git a/lib/vue-multiselect.min.js b/lib/vue-multiselect.min.js
diff --git a/lib/vue-multiselect.min.js.map b/lib/vue-multiselect.min.js.map
diff --git a/src/Multiselect.vue b/src/Multiselect.vue
@@ -7,7 +7,6 @@
     @keydown.self.down.prevent="pointerForward()"
     @keydown.self.up.prevent="pointerBackward()"
     @keydown.enter.stop.prevent.self="addPointerElement()"
-    @keydown.tab.stop="addPointerElement()"
     @keyup.esc="deactivate()"
     class="multiselect">
       <div @mousedown.prevent="toggle()" class="multiselect__select"></div>
@@ -45,7 +44,6 @@
           @keyup.down="pointerForward()"
           @keyup.up="pointerBackward()"
           @keydown.enter.stop.prevent.self="addPointerElement()"
-          @keydown.tab.stop="addPointerElement()"
           @keydown.delete="removeLastElement()"
           class="multiselect__input"/>
           <span