Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions src/Panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,16 @@ const CollapsePanel = React.forwardRef<HTMLDivElement, CollapsePanelProps>((prop
onItemClick?.(panelKey);
},
onKeyDown: (e: React.KeyboardEvent) => {
// Leave key events from nested controls (e.g. a button in `extra`) to those controls
if (e.target !== e.currentTarget) {
return;
}
if (e.key === 'Enter' || e.keyCode === KeyCode.ENTER || e.which === KeyCode.ENTER) {
onItemClick?.(panelKey);
} else if (e.key === ' ') {
// Prevent the page from scrolling, like a native button
e.preventDefault();
onItemClick?.(panelKey);
}
},
role: accordion ? 'tab' : 'button',
Expand Down
41 changes: 41 additions & 0 deletions tests/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,47 @@ describe('collapse', () => {
);
});

it('should toggle panel when press space', () => {
const { container } = render(
<Collapse>
<Panel header="collapse 1" key="1">
first
</Panel>
<Panel header="collapse 2" key="2" collapsible="disabled">
second
</Panel>
</Collapse>,
);
const [header, disabledHeader] = container.querySelectorAll('.rc-collapse-header');

fireEvent.keyDown(disabledHeader, { key: ' ' });
jest.runAllTimers();
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);

// `fireEvent` returns false when the default action (page scroll) is prevented
expect(fireEvent.keyDown(header, { key: ' ' })).toBe(false);
jest.runAllTimers();
expect(container.querySelector('.rc-collapse-panel')).toHaveClass('rc-collapse-panel-active');

fireEvent.keyDown(header, { key: ' ' });
jest.runAllTimers();
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
});

it('should leave keyboard events on a nested extra button to the button', () => {
const { getByRole, container } = render(
<Collapse
items={[{ key: '1', label: 'Header', extra: <button>Action</button>, children: 'Content' }]}
/>,
);
const button = getByRole('button', { name: 'Action' });

expect(fireEvent.keyDown(button, { key: ' ' })).toBe(true);
fireEvent.keyDown(button, { key: 'Enter', keyCode: KeyCode.ENTER });
jest.runAllTimers();
expect(container.querySelectorAll('.rc-collapse-panel-active')).toHaveLength(0);
});

it('should link the header to its panel with aria-controls', () => {
const { container } = render(
<Collapse defaultActiveKey="1">
Expand Down
Loading