fix(currentIndex) disallow negative index > -1 (#192)

* chore(*) release 2.1.1 * fix(index) don't go negative
darrenjennings · May 29, 2020 · 51e5599 · 51e5599
1 parent e616d70
commit 51e5599
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 6 deletions.
diff --git a/__tests__/autosuggest.test.js b/__tests__/autosuggest.test.js
@@ -882,4 +882,30 @@ describe("Autosuggest", () => {
     expect(itemChangedEmpty[0]).toBeNull();
     expect(itemChangedEmpty[1]).toBeNull();
   });
+
+  it("current index resilient against many keyups #190", async () => {
+    const props = { ...defaultProps };
+    props.inputProps = { ...defaultProps.inputProps };
+
+    const wrapper = mount(Autosuggest, {
+      propsData: props,
+    });
+
+    const input = wrapper.find("input");
+    input.setValue("G");
+    input.trigger("keydown.down");
+    await wrapper.vm.$nextTick(() => {})
+    expect(wrapper.vm.currentIndex).toBe(0)
+    input.trigger("keydown.up");
+    expect(wrapper.vm.currentIndex).toBe(-1)
+
+    // Go into the upside down, but make sure to come back unscathed
+    await wrapper.vm.$nextTick(() => {})
+    input.trigger("keydown.up");
+    await wrapper.vm.$nextTick(() => {})
+    input.trigger("keydown.up");
+    await wrapper.vm.$nextTick(() => {})
+
+    expect(wrapper.vm.currentIndex).toBe(-1)
+  });
 });
diff --git a/docs/build/app.js b/docs/build/app.js
diff --git a/docs/storybook/iframe.html b/docs/storybook/iframe.html
@@ -107,7 +107,7 @@
       <body>
         <div id="root"></div>
         <div id="error-display"></div>
-        <script src="static/preview.3342a23524c89d0f2aa9.bundle.js"></script>
+        <script src="static/preview.a4c7ea3211409c3899df.bundle.js"></script>
       </body>
     </html>
 
diff --git a/...ic/preview.3342a23524c89d0f2aa9.bundle.js → ...ic/preview.a4c7ea3211409c3899df.bundle.js b/...ic/preview.3342a23524c89d0f2aa9.bundle.js → ...ic/preview.a4c7ea3211409c3899df.bundle.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-autosuggest",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Vue autosuggest component.",
   "engines": {
     "node": "> 4",

diff --git a/src/Autosuggest.vue b/src/Autosuggest.vue
@@ -105,6 +105,8 @@
 import DefaultSection from "./parts/DefaultSection.js";
 import { addClass, removeClass } from "./utils";
 
+const INDEX_IS_FOCUSED_ON_INPUT = -1
+
 const defaultSectionConfig = {
   name: "default",
   type: "default-section"
@@ -462,14 +464,14 @@ export default {
             }
             // Determine direction of arrow up/down and determine new currentIndex
             const direction = keyCode === 40 ? 1 : -1;
-            const newIndex = (parseInt(this.currentIndex) || 0) + (wasClosed ? 0 : direction);
+            const newIndex = Math.max((parseInt(this.currentIndex) || 0) + (wasClosed ? 0 : direction), INDEX_IS_FOCUSED_ON_INPUT);
 
             this.setCurrentIndex(newIndex, this.totalResults);
             this.didSelectFromOptions = true;
             if (this.totalResults > 0 && this.currentIndex >= 0) {
               this.setChangeItem(this.getItemByIndex(this.currentIndex));
               this.didSelectFromOptions = true;
-            } else if (this.currentIndex == -1) {
+            } else if (this.currentIndex === INDEX_IS_FOCUSED_ON_INPUT) {
               this.setChangeItem(null)
               this.internalValue = this.searchInputOriginal;
               e.preventDefault();