From 3c668fd45e2dc9426d1be5803a9bb5786ed21a0f Mon Sep 17 00:00:00 2001
From: Jeff Sagal <sagalbot@gmail.com>
Date: Tue, 31 May 2016 17:11:13 -0700
Subject: [PATCH] separate typeahead pointer logic into mixin

---
 src/components/Select.vue      | 53 +++---------------------------
 src/mixins/pointerScroll.js    |  6 ++++
 src/mixins/typeAheadPointer.js | 60 ++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 49 deletions(-)
 create mode 100644 src/mixins/typeAheadPointer.js

diff --git a/src/components/Select.vue b/src/components/Select.vue
index 336b536..d943d8c 100644
--- a/src/components/Select.vue
+++ b/src/components/Select.vue
@@ -169,9 +169,10 @@
 
 <script type="text/babel">
   import pointerScroll from '../mixins/pointerScroll'
+  import typeAheadPointer from '../mixins/typeAheadPointer'
 
   export default {
-    mixins: [pointerScroll],
+    mixins: [pointerScroll, typeAheadPointer],
 
     props: {
       /**
@@ -310,8 +311,7 @@
     data() {
       return {
         search: '',
-        open: false,
-        typeAheadPointer: -1,
+        open: false
       }
     },
 
@@ -326,11 +326,7 @@
       },
       multiple( val ) {
         this.$set('value', val ? [] : null)
-      },
-      filteredOptions() {
-        this.typeAheadPointer = 0
-        this.maybeAdjustScroll()
-      },
+      }
     },
 
     methods: {
@@ -439,47 +435,6 @@
         return option;
       },
 
-      /**
-       * Move the typeAheadPointer visually up the list by
-       * subtracting the current index by one.
-       * @return {void}
-       */
-      typeAheadUp() {
-        if (this.typeAheadPointer > 0) {
-          this.typeAheadPointer--
-          this.maybeAdjustScroll()
-        }
-      },
-
-      /**
-       * Move the typeAheadPointer visually down the list by
-       * adding the current index by one.
-       * @return {void}
-       */
-      typeAheadDown() {
-        if (this.typeAheadPointer < this.filteredOptions.length - 1) {
-          this.typeAheadPointer++
-          this.maybeAdjustScroll()
-        }
-      },
-
-      /**
-       * Select the option at the current typeAheadPointer position.
-       * Optionally clear the search input on selection.
-       * @return {void}
-       */
-      typeAheadSelect() {
-        if( this.filteredOptions[ this.typeAheadPointer ] ) {
-          this.select( this.filteredOptions[ this.typeAheadPointer ] );
-        } else if (this.taggable && this.search.length){
-          this.select(this.search)
-        }
-
-        if( this.clearSearchOnSelect ) {
-          this.search = "";
-        }
-      },
-
       /**
        * If there is any text in the search input, remove it.
        * Otherwise, blur the search input to close the dropdown.
diff --git a/src/mixins/pointerScroll.js b/src/mixins/pointerScroll.js
index 11bcd74..6cb24bd 100644
--- a/src/mixins/pointerScroll.js
+++ b/src/mixins/pointerScroll.js
@@ -1,4 +1,10 @@
 export default {
+  watch: {
+    typeAheadPointer() {
+      this.maybeAdjustScroll()
+    }
+  },
+
   methods: {
     /**
      * Adjust the scroll position of the dropdown list
diff --git a/src/mixins/typeAheadPointer.js b/src/mixins/typeAheadPointer.js
new file mode 100644
index 0000000..62279d9
--- /dev/null
+++ b/src/mixins/typeAheadPointer.js
@@ -0,0 +1,60 @@
+export default {
+  data() {
+    return {
+      typeAheadPointer: -1
+    }
+  },
+
+  watch: {
+    filteredOptions() {
+      this.typeAheadPointer = 0
+    }
+  },
+
+  methods: {
+    /**
+     * Move the typeAheadPointer visually up the list by
+     * subtracting the current index by one.
+     * @return {void}
+     */
+    typeAheadUp() {
+      if (this.typeAheadPointer > 0) {
+        this.typeAheadPointer--
+        if( this.maybeAdjustScroll ) {
+          this.maybeAdjustScroll()
+        }
+      }
+    },
+
+    /**
+     * Move the typeAheadPointer visually down the list by
+     * adding the current index by one.
+     * @return {void}
+     */
+    typeAheadDown() {
+      if (this.typeAheadPointer < this.filteredOptions.length - 1) {
+        this.typeAheadPointer++
+        if( this.maybeAdjustScroll ) {
+          this.maybeAdjustScroll()
+        }
+      }
+    },
+
+    /**
+     * Select the option at the current typeAheadPointer position.
+     * Optionally clear the search input on selection.
+     * @return {void}
+     */
+    typeAheadSelect() {
+      if( this.filteredOptions[ this.typeAheadPointer ] ) {
+        this.select( this.filteredOptions[ this.typeAheadPointer ] );
+      } else if (this.taggable && this.search.length){
+        this.select(this.search)
+      }
+
+      if( this.clearSearchOnSelect ) {
+        this.search = "";
+      }
+    },
+  }
+}
\ No newline at end of file