Skip to content

Commit f56ae43

Browse files
fix: support Space key to toggle panel and prevent default scroll
1 parent 305b30a commit f56ae43

2 files changed

Lines changed: 52 additions & 0 deletions

File tree

‎src/Panel.tsx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,19 @@ const CollapsePanel = React.forwardRef<HTMLDivElement, CollapsePanelProps>((prop
3737
onItemClick?.(panelKey);
3838
},
3939
onKeyDown: (e: React.KeyboardEvent) => {
40+
if (disabled) {
41+
return;
42+
}
4043
if (e.key === 'Enter' || e.keyCode === KeyCode.ENTER || e.which === KeyCode.ENTER) {
4144
onItemClick?.(panelKey);
45+
} else if (
46+
e.key === ' ' ||
47+
e.key === 'Spacebar' ||
48+
e.keyCode === KeyCode.SPACE ||
49+
e.which === KeyCode.SPACE
50+
) {
51+
e.preventDefault();
52+
onItemClick?.(panelKey);
4253
}
4354
},
4455
role: accordion ? 'tab' : 'button',

‎tests/index.spec.tsx‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,47 @@ describe('collapse', () => {
445445
);
446446
});
447447

448+
it('should toggle panel and prevent default when press space', () => {
449+
const spaceKeyEvent = {
450+
key: ' ',
451+
keyCode: KeyCode.SPACE,
452+
which: KeyCode.SPACE,
453+
charCode: KeyCode.SPACE,
454+
};
455+
456+
const { container } = render(
457+
<Collapse>
458+
<Panel header="collapse 1" key="1">
459+
first
460+
</Panel>
461+
<Panel header="collapse 2" key="2">
462+
second
463+
</Panel>
464+
<Panel header="collapse 3" key="3" collapsible="disabled">
465+
third
466+
</Panel>
467+
</Collapse>,
468+
);
469+
470+
const headers = container.querySelectorAll('.rc-collapse-header');
471+
fireEvent.keyDown(headers[2], spaceKeyEvent);
472+
jest.runAllTimers();
473+
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
474+
475+
const header = headers[0];
476+
const defaultPrevented = !fireEvent.keyDown(header, spaceKeyEvent);
477+
jest.runAllTimers();
478+
479+
expect(defaultPrevented).toBeTruthy();
480+
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(1);
481+
expect(container.querySelector('.rc-collapse-panel')).toHaveClass('rc-collapse-panel-active');
482+
483+
fireEvent.keyDown(header, spaceKeyEvent);
484+
jest.runAllTimers();
485+
486+
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
487+
});
488+
448489
describe('wrapped in Fragment', () => {
449490
const expandIcon = () => <span>test{'>'}</span>;
450491
const element = (

0 commit comments

Comments
 (0)