Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Selector/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import MultipleSelector from './MultipleSelector';
import SingleSelector from './SingleSelector';
import useLock from '../hooks/useLock';
import type { CustomTagProps, DisplayValueType, Mode, RenderNode } from '../BaseSelect';
import { isValidateOpenKey } from '../utils/keyUtil';

export interface InnerSelectorProps {
prefixCls: string;
Expand Down Expand Up @@ -143,7 +144,7 @@ const Selector: React.RefForwardingComponent<RefSelectorProps, SelectorProps> =
onSearchSubmit?.((event.target as HTMLInputElement).value);
}

if (![KeyCode.SHIFT, KeyCode.TAB, KeyCode.BACKSPACE, KeyCode.ESC].includes(which)) {
if (isValidateOpenKey(which)) {
onToggleOpen(true);
}
};
Expand Down
34 changes: 34 additions & 0 deletions src/utils/keyUtil.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import KeyCode from 'rc-util/lib/KeyCode';

/** keyCode Judgment function */
export function isValidateOpenKey(currentKeyCode: number): boolean {
return ![
// System function button
KeyCode.ESC,
KeyCode.SHIFT,
KeyCode.BACKSPACE,
KeyCode.TAB,
KeyCode.WIN_KEY,
KeyCode.ALT,
KeyCode.META,
KeyCode.WIN_KEY_RIGHT,
KeyCode.CTRL,
KeyCode.SEMICOLON,
KeyCode.EQUALS,
KeyCode.CAPS_LOCK,
KeyCode.CONTEXT_MENU,
// F1-F12
KeyCode.F1,
KeyCode.F2,
KeyCode.F3,
KeyCode.F4,
KeyCode.F5,
KeyCode.F6,
KeyCode.F7,
KeyCode.F8,
KeyCode.F9,
KeyCode.F10,
KeyCode.F11,
KeyCode.F12,
].includes(currentKeyCode);
}
41 changes: 41 additions & 0 deletions tests/Select.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,47 @@ describe('Select.Basic', () => {
expect(onKeyDown).toHaveBeenCalledTimes(1);
});

it('not open when system key down', () => {
const wrapper = mount(
<Select>
<Option value="1">1</Option>
<Option value="2">2</Option>
</Select>,
);

wrapper
.find('input')
.simulate('keyDown', { which: KeyCode.ESC })
.simulate('keyDown', { which: KeyCode.SHIFT })
.simulate('keyDown', { which: KeyCode.BACKSPACE })
.simulate('keyDown', { which: KeyCode.TAB })
.simulate('keyDown', { which: KeyCode.WIN_KEY })
.simulate('keyDown', { which: KeyCode.ALT })
.simulate('keyDown', { which: KeyCode.META })
.simulate('keyDown', { which: KeyCode.WIN_KEY_RIGHT })
.simulate('keyDown', { which: KeyCode.CTRL })
.simulate('keyDown', { which: KeyCode.SEMICOLON })
.simulate('keyDown', { which: KeyCode.EQUALS })
.simulate('keyDown', { which: KeyCode.CAPS_LOCK })
.simulate('keyDown', { which: KeyCode.CONTEXT_MENU })
.simulate('keyDown', { which: KeyCode.F1 })
.simulate('keyDown', { which: KeyCode.F2 })
.simulate('keyDown', { which: KeyCode.F3 })
.simulate('keyDown', { which: KeyCode.F4 })
.simulate('keyDown', { which: KeyCode.F5 })
.simulate('keyDown', { which: KeyCode.F6 })
.simulate('keyDown', { which: KeyCode.F7 })
.simulate('keyDown', { which: KeyCode.F8 })
.simulate('keyDown', { which: KeyCode.F9 })
.simulate('keyDown', { which: KeyCode.F10 })
.simulate('keyDown', { which: KeyCode.F11 })
.simulate('keyDown', { which: KeyCode.F12 });
expectOpen(wrapper, false);

wrapper.find('input').simulate('keyDown', { which: KeyCode.NUM_ONE });
expectOpen(wrapper, true);
});

it('close after select', () => {
const wrapper = mount(
<Select>
Expand Down