Skip to content

fix: should stopPropagation when pressing esc #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 19, 2021
Merged

fix: should stopPropagation when pressing esc #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05d7aa4
fix: should stopPropagation when pressing esc
kerm1it Jan 18, 2021
c0aca65
chore: optimize logic
kerm1it Jan 19, 2021
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: 3 additions & 0 deletions src/OptionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ const OptionList: React.RefForwardingComponent<
// >>> Close
case KeyCode.ESC: {
onToggleOpen(false);
if (open) {
event.stopPropagation();
}
}
}
},
Expand Down
13 changes: 12 additions & 1 deletion tests/Select.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,12 @@ describe('Select.Basic', () => {
});

it('close on ESC', () => {
const wrapper = mount(<Select />);
const onKeyDown = jest.fn();
const wrapper = mount(
<div onKeyDown={onKeyDown}>
<Select />
</div>,
);
toggleOpen(wrapper);
wrapper
.find('input')
Expand All @@ -677,6 +682,12 @@ describe('Select.Basic', () => {

expect(wrapper.find('input').props().value).toBe('');
expectOpen(wrapper, false);
expect(onKeyDown).toHaveBeenCalledTimes(0);

// should keep propagation when optionList is closed
wrapper.simulate('keyDown', { which: KeyCode.ESC });
wrapper.update();
expect(onKeyDown).toHaveBeenCalledTimes(1);
});

it('close after select', () => {
Expand Down