diff --git a/src/components/Select.vue b/src/components/Select.vue index 193b4f3a4..122a1110c 100644 --- a/src/components/Select.vue +++ b/src/components/Select.vue @@ -1146,6 +1146,10 @@ export default { * @return {void} */ select(option) { + if (this.disabled) { + return + } + this.$emit('option:selecting', option) if (!this.isOptionSelected(option)) { if (this.taggable && !this.optionExists(option)) { diff --git a/tests/unit/Selecting.spec.js b/tests/unit/Selecting.spec.js index 8aedfd62a..8fabaa84a 100755 --- a/tests/unit/Selecting.spec.js +++ b/tests/unit/Selecting.spec.js @@ -22,6 +22,28 @@ describe('VS - Selecting Values', () => { } }) + it('ignores a pending option click when disabled before mouseup', async () => { + const select = mount(VueSelect, { + props: { modelValue: 'Apple', options: ['Apple', 'Orange'] }, + }) + const search = select.get('.vs__search') + await search.trigger('keydown.enter') + const orange = select.findAll('[role="option"]')[1] + await orange.trigger('mousedown') + await select.setProps({ disabled: true }) + await search.trigger('blur') + await orange.trigger('mouseup') + await orange.trigger('click') + + expect(select.emitted('update:modelValue')).toBeUndefined() + expect(select.emitted('option:selecting')).toBeUndefined() + + await select.setProps({ disabled: false }) + await orange.trigger('click') + expect(select.emitted('update:modelValue')).toEqual([['Orange']]) + select.unmount() + }) + it('can accept an array with pre-selected values', () => { const Select = shallowMount(VueSelect, { props: defaultProps,