Skip to content

refactor: use renderable guards for panel content #455

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

Merged
yoyo837 merged 2 commits into from
Sep 3, 2026
+15 −8
Merged

refactor: use renderable guards for panel content #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f3d661
refactor: use renderable guards
QDyanbing Sep 2, 2026
eb2ba73
fix: preserve extra value semantics
QDyanbing Sep 3, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dependencies": {
"@babel/runtime": "^8.0.0",
"@rc-component/motion": "^1.1.4",
"@rc-component/util": "^1.11.1",
"@rc-component/util": "^1.13.0",
"clsx": "^2.1.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions src/Panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { clsx } from 'clsx';
import CSSMotion from '@rc-component/motion';
import { KeyCode } from '@rc-component/util';
import { isNonNullable, isReactRenderable, KeyCode } from '@rc-component/util';
import React from 'react';
import type { CollapsePanelProps } from './interface';
import PanelContent from './PanelContent';
Expand Down Expand Up @@ -30,7 +30,7 @@ const CollapsePanel = React.forwardRef<HTMLDivElement, CollapsePanelProps>((prop

const disabled = collapsible === 'disabled';

const ifExtraExist = extra !== null && extra !== undefined && typeof extra !== 'boolean';
const ifExtraExist = isNonNullable(extra) && typeof extra !== 'boolean';

const collapsibleProps = {
onClick: () => {
Expand All @@ -50,7 +50,7 @@ const CollapsePanel = React.forwardRef<HTMLDivElement, CollapsePanelProps>((prop
// ======================== Icon ========================
const iconNodeInner =
typeof expandIcon === 'function' ? expandIcon(props) : <i className="arrow" />;
const iconNode = iconNodeInner && (
const iconNode = isReactRenderable(iconNodeInner) && (
<div
className={clsx(`${prefixCls}-expand-icon`, customizeClassNames?.icon)}
style={styles?.icon}
Expand Down
15 changes: 11 additions & 4 deletions tests/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,25 @@ describe('collapse', () => {
});
});

it('should support extra whit number 0', () => {
it.each([
{ name: 'number zero', extra: 0, expected: true, content: '0' },
{ name: 'empty string', extra: '', expected: true, content: '' },
{ name: 'true', extra: true, expected: false },
{ name: 'false', extra: false, expected: false },
])('should preserve extra semantics for $name', ({ extra, expected, content }) => {
const { container } = render(
<Collapse onChange={onChange} activeKey={0}>
<Panel header="collapse 0" key={0} extra={0}>
<Panel header="collapse 0" key={0} extra={extra}>
zero
</Panel>
</Collapse>,
);

const extraNodes = container.querySelectorAll('.rc-collapse-extra');
expect(extraNodes).toHaveLength(1);
expect(extraNodes[0].innerHTML).toBe('0');
expect(extraNodes).toHaveLength(expected ? 1 : 0);
if (expected) {
expect(extraNodes[0].innerHTML).toBe(content);
}
});

it('should support activeKey number 0', () => {
Expand Down
Loading