Skip to content

Commit aed4afe

Browse files
committed
fix: support Space key activation
1 parent dcd0f78 commit aed4afe

2 files changed

Lines changed: 34 additions & 6 deletions

File tree

‎src/Panel.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,16 @@ const CollapsePanel = React.forwardRef<HTMLDivElement, CollapsePanelProps>((prop
3737
onItemClick?.(panelKey);
3838
},
3939
onKeyDown: (e: React.KeyboardEvent) => {
40-
if (e.key === 'Enter' || e.keyCode === KeyCode.ENTER || e.which === KeyCode.ENTER) {
40+
if (
41+
!disabled &&
42+
(e.key === 'Enter' ||
43+
e.key === ' ' ||
44+
e.keyCode === KeyCode.ENTER ||
45+
e.keyCode === KeyCode.SPACE ||
46+
e.which === KeyCode.ENTER ||
47+
e.which === KeyCode.SPACE)
48+
) {
49+
e.preventDefault();
4150
onItemClick?.(panelKey);
4251
}
4352
},

‎tests/index.spec.tsx‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,14 +395,20 @@ describe('collapse', () => {
395395
});
396396
});
397397

398-
it('should toggle panel when press enter', () => {
399-
const myKeyEvent = {
398+
it('should toggle panel when press Enter or Space', () => {
399+
const enterKeyEvent = {
400400
key: 'Enter',
401401
keyCode: KeyCode.ENTER,
402402
which: KeyCode.ENTER,
403403
// https://github.com/testing-library/react-testing-library/issues/269#issuecomment-455854112
404404
charCode: KeyCode.ENTER,
405405
};
406+
const spaceKeyEvent = {
407+
key: ' ',
408+
keyCode: KeyCode.SPACE,
409+
which: KeyCode.SPACE,
410+
charCode: KeyCode.SPACE,
411+
};
406412

407413
const { container } = render(
408414
<Collapse>
@@ -418,24 +424,37 @@ describe('collapse', () => {
418424
</Collapse>,
419425
);
420426

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

425-
fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, myKeyEvent);
432+
fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, enterKeyEvent);
426433
jest.runAllTimers();
427434

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

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

432-
fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, myKeyEvent);
439+
fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, enterKeyEvent);
433440
jest.runAllTimers();
434441

435442
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
436443
expect(container.querySelector('.rc-collapse-panel')!.className).not.toContain(
437444
'rc-collapse-panel-active',
438445
);
446+
447+
expect(fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, spaceKeyEvent)).toBe(
448+
false,
449+
);
450+
jest.runAllTimers();
451+
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(1);
452+
453+
expect(fireEvent.keyDown(container.querySelector('.rc-collapse-header')!, spaceKeyEvent)).toBe(
454+
false,
455+
);
456+
jest.runAllTimers();
457+
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
439458
});
440459

441460
describe('wrapped in Fragment', () => {

0 commit comments

Comments
 (0)