fix useCombobox

downshift-js · Apr 11, 2020 · bc6af26 · bc6af26
1 parent d72a479
commit bc6af26
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/hooks/useCombobox/__tests__/getInputProps.test.js b/src/hooks/useCombobox/__tests__/getInputProps.test.js
@@ -664,6 +664,29 @@ describe('getInputProps', () => {
         )
       })
 
+      test('enter while IME composing will not select highlighted item', () => {
+        const initialHighlightedIndex = 2
+        const {keyDownOnInput, input, getItems} = renderCombobox({
+          initialHighlightedIndex,
+          initialIsOpen: true,
+        })
+
+        keyDownOnInput('Enter', {keyCode: 229})
+
+        expect(input.value).toEqual('')
+        expect(getItems()).toHaveLength(items.length)
+        expect(input).toHaveAttribute(
+          'aria-activedescendant',
+          defaultIds.getItemId(initialHighlightedIndex),
+        )
+
+        keyDownOnInput('Enter')
+
+        expect(input.value).toEqual(items[2])
+        expect(getItems()).toHaveLength(0)
+        expect(input).not.toHaveAttribute('aria-activedescendant')
+      })
+
       test('tab it closes the menu and selects highlighted item', () => {
         const initialHighlightedIndex = 2
         const {input, getItems} = renderCombobox(

diff --git a/src/hooks/useCombobox/index.js b/src/hooks/useCombobox/index.js
@@ -235,6 +235,11 @@ function useCombobox(userProps = {}) {
       })
     },
     Enter(event) {
+      // if IME composing, wait for next Enter keydown event.
+      if (event.which === 229) {
+        return
+      }
+
       event.preventDefault()
       dispatch({
         type: stateChangeTypes.InputKeyDownEnter,