chore: more logic

Author: zombieJ

src/SelectInput/Input.tsx

@@ -108,6 +108,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
   // ============================= Render =============================
   return (
     <input
+      type={mode === 'combobox' ? 'text' : 'search'}
       {...restProps}
       ref={inputRef}
       style={

src/utils/keyUtil.ts

@@ -24,7 +24,7 @@ export function isValidateOpenKey(currentKeyCode: number): boolean {
       KeyCode.CONTEXT_MENU,
       // Arrow keys - should not trigger open when navigating in input
       KeyCode.UP,
-      KeyCode.DOWN,
+      // KeyCode.DOWN,
       KeyCode.LEFT,
       KeyCode.RIGHT,
       // F1-F12

tests/Select.test.tsx

@@ -35,6 +35,15 @@ import {
 describe('Select.Basic', () => {
   injectRunAllTimers(jest);
 
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.clearAllTimers();
+    jest.useRealTimers();
+  });
+
   allowClearTest(undefined, '903');
   focusTest('single', {});
   blurTest('single');
@@ -786,14 +795,16 @@ describe('Select.Basic', () => {
   });
 
   [KeyCode.ENTER, KeyCode.DOWN].forEach((keyCode) => {
-    it('open on key press', () => {
+    it(`open on key press: ${keyCode}`, () => {
       const { container } = render(<Select />);
       keyDown(container.querySelector('input'), keyCode);
       expectOpen(container);
     });
   });
 
   it('close on ESC', () => {
+    jest.useFakeTimers();
+
     const onKeyDown = jest.fn();
     const { container } = render(
       <div onKeyDown={onKeyDown}>
@@ -805,14 +816,22 @@ describe('Select.Basic', () => {
     const inputEle = container.querySelector('input');
     fireEvent.change(inputEle, { target: { value: 'foo' } });
     keyDown(inputEle, KeyCode.ESC);
+    act(() => {
+      jest.runAllTimers();
+    });
 
     expect(inputEle.value).toBe('');
     expectOpen(container, false);
     expect(onKeyDown).toHaveBeenCalledTimes(0);
 
     // should keep propagation when optionList is closed
     keyDown(inputEle, KeyCode.ESC);
+    act(() => {
+      jest.runAllTimers();
+    });
     expect(onKeyDown).toHaveBeenCalledTimes(1);
+
+    jest.useRealTimers();
   });
 
   it('not open when system key down', () => {

tests/utils/common.ts

@@ -19,6 +19,9 @@ export function expectOpen(wrapper: any, open: boolean = true) {
 export function toggleOpen(wrapper: any) {
   if (wrapper instanceof HTMLElement) {
     fireEvent.mouseDown(wrapper.querySelector('.rc-select'));
+    act(() => {
+      jest.runAllTimers();
+    });
     return;
   }
   wrapper.find('.rc-select').simulate('mousedown');
@@ -27,6 +30,9 @@ export function toggleOpen(wrapper: any) {
 export function selectItem(wrapper: any, index: number = 0) {
   if (wrapper instanceof HTMLElement) {
     fireEvent.click(wrapper.querySelectorAll('.rc-select-item-option-content')[index]);
+    act(() => {
+      jest.runAllTimers();
+    });
     return;
   }
   wrapper.find('div.rc-select-item-option-content').at(index).simulate('click');