From ecd76ce4dd583332f4e1d0d8ee7a22f3fd1d96c8 Mon Sep 17 00:00:00 2001
From: Kori Roys <kori@koriroys.com>
Date: Sat, 1 Apr 2017 12:07:19 +0200
Subject: [PATCH] improving name for should-dropdown-close option. adding test

---
 dev.html                       |  3 ++-
 src/components/Select.vue      | 15 +++++----------
 test/unit/specs/Select.spec.js | 24 ++++++++++++++++++++++--
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/dev.html b/dev.html
index bc01d7a..5e9f51d 100644
--- a/dev.html
+++ b/dev.html
@@ -34,7 +34,8 @@
         <v-select placeholder="multiple" multiple :options="options"></v-select>
         <v-select placeholder="multiple, taggable" multiple taggable :options="options" no-drop></v-select>
         <v-select placeholder="multiple, taggable, push-tags" multiple push-tags taggable :options="[{label: 'Foo', value: 'foo'}]"></v-select>
-        <v-select placeholder="multiple, closeOnSelect" multiple :close-on-multi-select="true" :options="['cat', 'dog', 'bear']"></v-select>
+        <v-select placeholder="multiple, closeOnSelect=true" multiple :options="['cat', 'dog', 'bear']"></v-select>
+        <v-select placeholder="multiple, closeOnSelect=false" multiple :close-on-select="false" :options="['cat', 'dog', 'bear']"></v-select>
         <v-select placeholder="unsearchable" :options="options" :searchable="false"></v-select>
         <v-select placeholder="search github.." label="full_name" @search="search" :options="ajaxRes"></v-select>
     </div>
diff --git a/src/components/Select.vue b/src/components/Select.vue
index ef65e60..5c3e4a5 100644
--- a/src/components/Select.vue
+++ b/src/components/Select.vue
@@ -391,13 +391,13 @@
       },
 
       /**
-       * Allows user to choose to close the select dropdown when an option is selected.
-       * set to true when multiple=true to close the dropdown between each selection
+       * Close a dropdown when an option is select. Set to false to keep the dropdown
+       * open (useful when combined with multi-select, for example)
        * @type {Boolean}
        */
-      closeOnMultiSelect: {
+      closeOnSelect: {
         type: Boolean,
-        default: false
+        default: true
       },
 
       /**
@@ -635,12 +635,7 @@
        * @return {void}
        */
       onAfterSelect(option) {
-        if (this.multiple) {
-          if (this.closeOnMultiSelect) {
-            this.open = !this.open
-            this.$refs.search.blur()
-          }
-        } else {
+        if (this.closeOnSelect) {
           this.open = !this.open
           this.$refs.search.blur()
         }
diff --git a/test/unit/specs/Select.spec.js b/test/unit/specs/Select.spec.js
index 65f7421..ba98bf5 100644
--- a/test/unit/specs/Select.spec.js
+++ b/test/unit/specs/Select.spec.js
@@ -351,9 +351,10 @@ describe('Select.vue', () => {
 			})
 		})
 
-		it('can close the dropdown when the el is clicked, multiple is true, and multipleCloseOnSelect option is true', (done) => {
+
+		it('closes the dropdown when an option is selected, multiple is true, and closeOnSelect option is true', (done) => {
 			const vm = new Vue({
-				template: '<div><v-select ref="select" :options="options" multiple closeOnMultiSelect :value="value"></v-select></div>',
+				template: '<div><v-select ref="select" :options="options" multiple :value="value"></v-select></div>',
 				components: {vSelect},
 				data: {
 					value: [],
@@ -370,6 +371,25 @@ describe('Select.vue', () => {
 			})
 		})
 
+		it('does not close the dropdown when the el is clicked, multiple is true, and closeOnSelect option is false', (done) => {
+			const vm = new Vue({
+				template: '<div><v-select ref="select" :options="options" multiple :closeOnSelect="false" :value="value"></v-select></div>',
+				components: {vSelect},
+				data: {
+					value: [],
+					options: ['one', 'two', 'three']
+				}
+			}).$mount()
+
+			vm.$children[0].open = true
+			vm.$refs.select.select('one')
+
+			Vue.nextTick(() => {
+				expect(vm.$children[0].open).toEqual(true)
+				done()
+			})
+		})
+
 
 		it('should close the dropdown on search blur', () => {
 			const vm = new Vue({