codeDebugTest
diff --git a/‎lib/multiselectMixin.js
Lines changed: 21 additions & 29 deletions b/‎lib/multiselectMixin.js
Lines changed: 21 additions & 29 deletions
@@ -74,7 +74,7 @@ module.exports = {
     return {
       search: '',
       isOpen: false,
-      internalValue: this.value || this.value === 0 ? (0, _utils2.default)(this.value) : this.multiple ? [] : null
+      internalValue: this.value || this.value === 0 ? this.multiple ? (0, _utils2.default)(this.value) : (0, _utils2.default)([this.value]) : []
     };
   },
 
@@ -213,9 +213,9 @@ module.exports = {
       var _this = this;
 
       if (this.trackBy) {
-        return this.multiple ? this.internalValue.map(function (element) {
+        return this.internalValue.map(function (element) {
           return element[_this.trackBy];
-        }) : this.internalValue[this.trackBy];
+        });
       } else {
         return this.internalValue;
       }
@@ -231,13 +231,13 @@ module.exports = {
       });
     },
     currentOptionLabel: function currentOptionLabel() {
-      return this.getOptionLabel(this.internalValue) + '';
+      return this.getOptionLabel(this.internalValue[0]) + '';
     }
   },
   watch: {
     'internalValue': function internalValue() {
       if (this.resetAfter) {
-        this.internalValue = null;
+        this.internalValue = [];
         this.search = '';
       }
       this.adjustSearch();
@@ -248,7 +248,7 @@ module.exports = {
       this.$emit('search-change', this.search, this.id);
     },
     'value': function value() {
-      this.internalValue = (0, _utils2.default)(this.value);
+      this.internalValue = (0, _utils2.default)(this.multiple ? this.value : [this.value]);
     }
   },
   methods: {
@@ -265,14 +265,8 @@ module.exports = {
       return !this.options ? false : this.optionKeys.indexOf(query) > -1;
     },
     isSelected: function isSelected(option) {
-      if (!this.internalValue) return false;
       var opt = this.trackBy ? option[this.trackBy] : option;
-
-      if (this.multiple) {
-        return this.valueKeys.indexOf(opt) > -1;
-      } else {
-        return this.valueKeys === opt;
-      }
+      return this.valueKeys.indexOf(opt) > -1;
     },
     isNotSelected: function isNotSelected(option) {
       return !this.isSelected(option);
@@ -290,22 +284,18 @@ module.exports = {
         this.$emit('tag', option.label, this.id);
         this.search = '';
       } else {
-        if (this.multiple) {
-          if (this.isSelected(option)) {
-            if (key !== 'Tab') this.removeElement(option);
-            return;
-          } else {
-            this.internalValue.push(option);
-          }
+        var isSelected = this.isSelected(option);
+        if (isSelected) {
+          if (key !== 'Tab') this.removeElement(option);
+          return;
+        } else if (this.multiple) {
+          this.internalValue.push(option);
         } else {
-          var isSelected = this.isSelected(option);
-
-          if (isSelected && (!this.allowEmpty || key === 'Tab')) return;
-
-          this.internalValue = isSelected ? null : option;
+          this.internalValue = [option];
         }
         this.$emit('select', (0, _utils2.default)(option), this.id);
-        this.$emit('input', (0, _utils2.default)(this.internalValue), this.id);
+        var value = this.multiple ? this.internalValue : this.internalValue[0];
+        this.$emit('input', (0, _utils2.default)(value), this.id);
 
         if (this.closeOnSelect) this.deactivate();
       }
@@ -314,11 +304,12 @@ module.exports = {
       if (this.disabled) return;
       if (!this.allowEmpty && this.internalValue.length <= 1) return;
 
-      var index = this.multiple && (typeof option === 'undefined' ? 'undefined' : _typeof(option)) === 'object' ? this.valueKeys.indexOf(option[this.trackBy]) : this.valueKeys.indexOf(option);
+      var index = (typeof option === 'undefined' ? 'undefined' : _typeof(option)) === 'object' ? this.valueKeys.indexOf(option[this.trackBy]) : this.valueKeys.indexOf(option);
 
       this.internalValue.splice(index, 1);
       this.$emit('remove', (0, _utils2.default)(option), this.id);
-      this.$emit('input', (0, _utils2.default)(this.internalValue), this.id);
+      var value = this.multiple ? this.internalValue : this.internalValue[0];
+      this.$emit('input', (0, _utils2.default)(value), this.id);
     },
     removeLastElement: function removeLastElement() {
       if (this.blockKeys.indexOf('Delete') !== -1) return;
@@ -351,7 +342,8 @@ module.exports = {
       } else {
         this.$el.blur();
       }
-      this.$emit('close', (0, _utils2.default)(this.internalValue), this.id);
+      var value = this.multiple ? this.internalValue : this.internalValue[0];
+      this.$emit('close', (0, _utils2.default)(value), this.id);
     },
     adjustSearch: function adjustSearch() {
       if (!this.searchable || !this.clearOnSelect) return;