Skip to content

fix: Call passed onKeyDown in all cases when handling keydown event #122

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 1 commit into from
Dec 29, 2020
Merged

fix: Call passed onKeyDown in all cases when handling keydown event #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/Cascader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {
e.keyCode !== KeyCode.TAB
) {
this.setPopupVisible(true);
if (this.props.onKeyDown) {
this.props.onKeyDown(e);
}
return;
}
if (e.keyCode === KeyCode.DOWN || e.keyCode === KeyCode.UP) {
Expand Down Expand Up @@ -324,6 +327,9 @@ class Cascader extends React.Component<CascaderProps, CascaderState> {
}
} else if (e.keyCode === KeyCode.ESC || e.keyCode === KeyCode.TAB) {
this.setPopupVisible(false);
if (this.props.onKeyDown) {
this.props.onKeyDown(e);
}
return;
}
if (!activeValue || activeValue.length === 0) {
Expand Down
19 changes: 18 additions & 1 deletion tests/keyboard.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { mount } from 'enzyme';
import KeyCode from 'rc-util/lib/KeyCode';
import Cascader from '../';
import Cascader from '..';
import { addressOptions } from './demoOptions';

describe('Cascader', () => {
Expand Down Expand Up @@ -131,6 +131,23 @@ describe('Cascader', () => {
).toBe(true);
});

it('should call the Cascader onKeyDown callback in all cases', () => {
const onKeyDown = jest.fn();

wrapper = mount(
<Cascader options={addressOptions} onChange={onChange} onKeyDown={onKeyDown} expandIcon="">
<input readOnly />
</Cascader>,
);
wrapper.find('input').simulate('keyDown', { keyCode: KeyCode.DOWN });
expect(wrapper.state().popupVisible).toBeTruthy();
wrapper.find('input').simulate('keyDown', { keyCode: KeyCode.ESC });
expect(wrapper.state().popupVisible).toBeFalsy();
wrapper.find('input').simulate('keyDown', { keyCode: KeyCode.ENTER });

expect(onKeyDown).toHaveBeenCalledTimes(3);
});

it('should not handle keyDown events when children specify the onKeyDown', () => {
wrapper = mount(
<Cascader options={addressOptions} onChange={onChange} expandIcon="">
Expand Down