Skip to content

Commit cc40415

Browse files
Simplify normalized space key handling
1 parent 898c1ed commit cc40415

2 files changed

Lines changed: 14 additions & 7 deletions

File tree

‎src/Panel.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ const CollapsePanel = React.forwardRef<HTMLDivElement, CollapsePanelProps>((prop
4444
}
4545
if (e.key === 'Enter' || e.keyCode === KeyCode.ENTER || e.which === KeyCode.ENTER) {
4646
onItemClick?.(panelKey);
47-
} else if (
48-
e.key === ' ' ||
49-
e.key === 'Spacebar' ||
50-
e.keyCode === KeyCode.SPACE ||
51-
e.which === KeyCode.SPACE
52-
) {
47+
} else if (e.key === ' ') {
5348
e.preventDefault();
5449
onItemClick?.(panelKey);
5550
}

‎tests/index.spec.tsx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ describe('collapse', () => {
468468
);
469469

470470
const headers = container.querySelectorAll('.rc-collapse-header');
471-
fireEvent.keyDown(headers[2], spaceKeyEvent);
471+
expect(fireEvent.keyDown(headers[2], spaceKeyEvent)).toBe(true);
472472
jest.runAllTimers();
473473
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
474474

@@ -486,6 +486,18 @@ describe('collapse', () => {
486486
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
487487
});
488488

489+
it.each([{ key: 'Spacebar' }, { key: '', keyCode: KeyCode.SPACE }])(
490+
'should toggle for a normalized legacy space event: %o',
491+
event => {
492+
const { container } = render(
493+
<Collapse items={[{ key: '1', label: 'Header', children: 'Content' }]} />,
494+
);
495+
expect(fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, event)).toBe(false);
496+
jest.runAllTimers();
497+
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(1);
498+
},
499+
);
500+
489501
it('should leave space on a nested extra button to the button', () => {
490502
const { getByRole, container } = render(
491503
<Collapse

0 commit comments

Comments
 (0)