Skip to content

fix: support Space key activation #454

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

Open
nrps9909 wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −6
Open

fix: support Space key activation #454

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
11 changes: 10 additions & 1 deletion src/Panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,16 @@ const CollapsePanel = React.forwardRef<HTMLDivElement, CollapsePanelProps>((prop
onItemClick?.(panelKey);
},
onKeyDown: (e: React.KeyboardEvent) => {
if (e.key === 'Enter' || e.keyCode === KeyCode.ENTER || e.which === KeyCode.ENTER) {
if (
!disabled &&
(e.key === 'Enter' ||
e.key === ' ' ||
e.keyCode === KeyCode.ENTER ||
e.keyCode === KeyCode.SPACE ||
e.which === KeyCode.ENTER ||
e.which === KeyCode.SPACE)
) {
e.preventDefault();
onItemClick?.(panelKey);
}
},
Expand Down
29 changes: 24 additions & 5 deletions tests/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,14 +395,20 @@ describe('collapse', () => {
});
});

it('should toggle panel when press enter', () => {
const myKeyEvent = {
it('should toggle panel when press Enter or Space', () => {
const enterKeyEvent = {
key: 'Enter',
keyCode: KeyCode.ENTER,
which: KeyCode.ENTER,
// https://github.com/testing-library/react-testing-library/issues/269#issuecomment-455854112
charCode: KeyCode.ENTER,
};
const spaceKeyEvent = {
key: ' ',
keyCode: KeyCode.SPACE,
which: KeyCode.SPACE,
charCode: KeyCode.SPACE,
};

const { container } = render(
<Collapse>
Expand All @@ -418,24 +424,37 @@ describe('collapse', () => {
</Collapse>,
);

fireEvent.keyDown(container.querySelectorAll('.rc-collapse-header')?.[2], myKeyEvent);
fireEvent.keyDown(container.querySelectorAll('.rc-collapse-header')?.[2], enterKeyEvent);
fireEvent.keyDown(container.querySelectorAll('.rc-collapse-header')?.[2], spaceKeyEvent);
jest.runAllTimers();
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);

fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, myKeyEvent);
fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, enterKeyEvent);
jest.runAllTimers();

expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(1);

expect(container.querySelector('.rc-collapse-panel')).toHaveClass('rc-collapse-panel-active');

fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, myKeyEvent);
fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, enterKeyEvent);
jest.runAllTimers();

expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
expect(container.querySelector('.rc-collapse-panel')!.className).not.toContain(
'rc-collapse-panel-active',
);

expect(fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, spaceKeyEvent)).toBe(
false,
);
jest.runAllTimers();
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(1);

expect(fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, spaceKeyEvent)).toBe(
false,
);
jest.runAllTimers();
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
});

describe('wrapped in Fragment', () => {
Expand Down