From f8e549306abc24dbb8b30fc1c4e43e69920ae54c Mon Sep 17 00:00:00 2001 From: Jeff Sagal Date: Tue, 31 May 2016 18:35:01 -0700 Subject: [PATCH] use keydown for moving pointer, resolves #45 --- package.json | 2 +- src/components/Select.vue | 4 ++-- test/unit/specs/Select.spec.js | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 3725e6f..03dc557 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-select", - "version": "1.1.1", + "version": "1.1.2", "description": "A Vue.js project", "author": "Jeff Sagal ", "private": false, diff --git a/src/components/Select.vue b/src/components/Select.vue index 336b536..0e216c8 100644 --- a/src/components/Select.vue +++ b/src/components/Select.vue @@ -138,8 +138,8 @@ v-model="search" @keydown.delete="maybeDeleteValue" @keyup.esc="onEscape" - @keyup.up.prevent="typeAheadUp" - @keyup.down.prevent="typeAheadDown" + @keydown.up.prevent="typeAheadUp" + @keydown.down.prevent="typeAheadDown" @keyup.enter.prevent="typeAheadSelect" @blur="open = false" @focus="open = true" diff --git a/test/unit/specs/Select.spec.js b/test/unit/specs/Select.spec.js index 23abfb9..099743e 100644 --- a/test/unit/specs/Select.spec.js +++ b/test/unit/specs/Select.spec.js @@ -327,7 +327,7 @@ describe('Select.vue', () => { }) }) - it('should move the pointer visually up the list on up arrow keyUp', () => { + it('should move the pointer visually up the list on up arrow keyDown', () => { const vm = new Vue({ template: '
', components: {vSelect}, @@ -338,11 +338,11 @@ describe('Select.vue', () => { vm.$children[0].typeAheadPointer = 1 - trigger(vm.$children[0].$els.search, 'keyup', (e) => e.keyCode = 38) + trigger(vm.$children[0].$els.search, 'keydown', (e) => e.keyCode = 38) expect(vm.$children[0].typeAheadPointer).toEqual(0) }) - it('should move the pointer visually down the list on down arrow keyUp', () => { + it('should move the pointer visually down the list on down arrow keyDown', () => { const vm = new Vue({ template: '
', components: {vSelect}, @@ -352,7 +352,7 @@ describe('Select.vue', () => { }).$mount() vm.$children[0].typeAheadPointer = 1 - trigger(vm.$children[0].$els.search, 'keyup', (e) => e.keyCode = 40) + trigger(vm.$children[0].$els.search, 'keydown', (e) => e.keyCode = 40) expect(vm.$children[0].typeAheadPointer).toEqual(2) }) @@ -371,7 +371,7 @@ describe('Select.vue', () => { }) describe('Automatic Scrolling', () => { - it('should check if the scroll position needs to be adjusted on up arrow keyUp', () => { + it('should check if the scroll position needs to be adjusted on up arrow keyDown', () => { const vm = new Vue({ template: '
', components: {vSelect}, @@ -382,11 +382,11 @@ describe('Select.vue', () => { vm.$children[0].typeAheadPointer = 1 spyOn(vm.$children[0], 'maybeAdjustScroll') - trigger(vm.$children[0].$els.search, 'keyup', (e) => e.keyCode = 38) + trigger(vm.$children[0].$els.search, 'keydown', (e) => e.keyCode = 38) expect(vm.$children[0].maybeAdjustScroll).toHaveBeenCalled() }) - it('should check if the scroll position needs to be adjusted on down arrow keyUp', () => { + it('should check if the scroll position needs to be adjusted on down arrow keyDown', () => { const vm = new Vue({ template: '
', components: {vSelect}, @@ -396,7 +396,7 @@ describe('Select.vue', () => { }).$mount() spyOn(vm.$children[0], 'maybeAdjustScroll') - trigger(vm.$children[0].$els.search, 'keyup', (e) => e.keyCode = 40) + trigger(vm.$children[0].$els.search, 'keydown', (e) => e.keyCode = 40) expect(vm.$children[0].maybeAdjustScroll).toHaveBeenCalled() })