pressing enter after invalid search should be noop. Fixes #442

riophae · Feb 24, 2021 · bf4906e · bf4906e
1 parent 9ae16b6
commit bf4906e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/components/Input.vue b/src/components/Input.vue
@@ -138,7 +138,7 @@
           evt.preventDefault()
           if (instance.menu.current === null) return
           const current = instance.getNode(instance.menu.current)
-          if (current.isBranch && instance.disableBranchNodes) return
+          if ((current.isBranch && instance.disableBranchNodes) || !current.isMatched) return
           instance.select(current)
           break
         }

diff --git a/test/unit/specs/KeyboardSupport.spec.js b/test/unit/specs/KeyboardSupport.spec.js
@@ -123,11 +123,13 @@ describe('Keyboard Support', () => {
 
       wrapper.setProps({ multiple: false })
 
+      await typeSearchText(wrapper, 'a')
       pressEnterKey(wrapper)
       expect(vm.internalValue).toEqual([ 'a' ])
       pressEnterKey(wrapper)
       expect(vm.internalValue).toEqual([ 'a' ])
 
+      await typeSearchText(wrapper, 'b')
       vm.setCurrentHighlightedOption(vm.forest.nodeMap.b)
       expect(vm.menu.current).toBe('b')
       pressEnterKey(wrapper)
@@ -139,17 +141,44 @@ describe('Keyboard Support', () => {
 
       wrapper.setProps({ multiple: true })
 
+      await typeSearchText(wrapper, 'a')
       pressEnterKey(wrapper)
       expect(vm.internalValue).toEqual([ 'a' ])
       pressEnterKey(wrapper)
       expect(vm.internalValue).toEqual([])
 
+      await typeSearchText(wrapper, 'b')
       vm.setCurrentHighlightedOption(vm.forest.nodeMap.b)
       expect(vm.menu.current).toBe('b')
       pressEnterKey(wrapper)
       expect(vm.internalValue).toEqual([ 'b' ])
     })
 
+    // https://github.com/riophae/vue-treeselect/issues/442
+    it('pressing enter after invalid search should be a no-op (single-select)', async () => {
+      const { wrapper, vm } = await createInstance()
+
+      wrapper.setProps({ multiple: false })
+
+      await typeSearchText(wrapper, 'a')
+      await typeSearchText(wrapper, 'ab')
+      pressEnterKey(wrapper)
+      expect(vm.internalValue).toEqual([])
+      pressEnterKey(wrapper)
+      expect(vm.internalValue).toEqual([])
+    })
+
+    it('pressing enter after invalid search should be a no-op (multi-select)', async () => {
+      const { wrapper, vm } = await createInstance()
+
+      wrapper.setProps({ multiple: true })
+
+      await typeSearchText(wrapper, 'a')
+      await typeSearchText(wrapper, 'ab')
+      pressEnterKey(wrapper)
+      expect(vm.internalValue).toEqual([])
+    })
+
     it('pressing enter key on a disabled option should be no-op', async () => {
       const { wrapper, vm } = await createInstance()