From 62e39357bdd74fc608ea4ed18d796aee737a26b7 Mon Sep 17 00:00:00 2001
From: Jeff <jeff.sagal@briteweb.com>
Date: Mon, 29 Apr 2019 11:11:23 -0700
Subject: [PATCH] WIP

- pull toggleTargets out of `toggleDropdown(e)` and into it's own computed property
- add focus, blur to options slots
---
 docs/.vuepress/components/BooksWithSlots.vue |  6 +-
 src/components/Select.vue                    | 64 +++++++++++---------
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/docs/.vuepress/components/BooksWithSlots.vue b/docs/.vuepress/components/BooksWithSlots.vue
index 5925001..df1e870 100644
--- a/docs/.vuepress/components/BooksWithSlots.vue
+++ b/docs/.vuepress/components/BooksWithSlots.vue
@@ -1,7 +1,7 @@
 <template>
-  <v-select :options="books" label="title">
-    <template #selected-option="{author, title}">
-      <component :is="option" v-bind="{author, title}"/>
+  <v-select :options="books" label="title" multiple>
+    <template #selected-option="{author, title, focus}">
+      <component :is="option" v-bind="{author, title}" @click="focus"/>
     </template>
     <template #option="{author, title}">
       <component :is="option" v-bind="{author, title}"/>
diff --git a/src/components/Select.vue b/src/components/Select.vue
index 18137fb..04ef3cb 100644
--- a/src/components/Select.vue
+++ b/src/components/Select.vue
@@ -557,22 +557,7 @@
        * @return {void}
        */
       toggleDropdown (e) {
-        const target = e.target;
-        const toggleTargets = [
-          this.$el,
-          this.searchEl,
-          this.$refs.toggle.$el,
-        ];
-
-        if (typeof this.$refs.openIndicator !== 'undefined') {
-          toggleTargets.push(
-            this.$refs.openIndicator.$el,
-            // the line below is a bit gross, but required to support IE11 without adding polyfills
-            ...Array.prototype.slice.call(this.$refs.openIndicator.$el.childNodes),
-          );
-        }
-
-        if (toggleTargets.indexOf(target) > -1 || target.classList.contains('vs__selected')) {
+        if (this.toggleTargets.indexOf(e.target) > -1 || e.target.classList.contains('vs__selected')) {
           if (this.open) {
             this.searchEl.blur(); // dropdown will close on blur
           } else {
@@ -686,7 +671,12 @@
        * @return {*}
        */
       normalizeOptionForSlot (option) {
-        return (typeof option === 'object') ? option : {[this.label]: option};
+        const normalized = (typeof option === 'object') ? option : {[this.label]: option};
+        return {
+          ...normalized,
+          focus: this.onSearchFocus,
+          blur: this.onSearchBlur,
+        };
       },
 
       /**
@@ -720,20 +710,20 @@
        * @emits  {search:blur}
        * @return {void}
        */
-      onSearchBlur() {
+      onSearchBlur () {
         if (this.mousedown && !this.searching) {
-          this.mousedown = false
+          this.mousedown = false;
         } else {
           if (this.clearSearchOnBlur) {
-            this.search = ''
+            this.search = '';
           }
-          this.closeSearchOptions()
-          return
+          this.closeSearchOptions();
+          return;
         }
         // Fixed bug where no-options message could not be closed
-        if (this.search.length === 0 && this.options.length === 0){
-          this.closeSearchOptions()
-          return
+        if (this.search.length === 0 && this.options.length === 0) {
+          this.closeSearchOptions();
+          return;
         }
       },
 
@@ -742,9 +732,9 @@
        * @emits  {search:focus}
        * @return {void}
        */
-      onSearchFocus() {
-        this.open = true
-        this.$emit('search:focus')
+      onSearchFocus () {
+        this.open = true;
+        this.$emit('search:focus');
       },
 
       /**
@@ -851,6 +841,24 @@
         return this.options.concat(this.pushedTags);
       },
 
+      toggleTargets () {
+        const toggleTargets = [
+          this.$el,
+          this.searchEl,
+          this.$refs.toggle,
+        ];
+
+        if (typeof this.$refs.openIndicator !== 'undefined') {
+          toggleTargets.push(
+            this.$refs.openIndicator.$el,
+            // the line below is a bit gross, but required to support IE11 without adding polyfills
+            ...Array.prototype.slice.call(this.$refs.openIndicator.$el.childNodes),
+          );
+        }
+
+        return toggleTargets;
+      },
+
       /**
        * Find the search input DOM element.
        * @returns {HTMLInputElement}