Skip to content

Commit 807f237

Browse files
authored
fix(Card, Tag, Breadcrumb, Segmented, FloatButton): render numeric zero for content nodes (#59117)
1 parent e8fbc23 commit 807f237

12 files changed

Lines changed: 68 additions & 17 deletions

File tree

‎components/breadcrumb/BreadcrumbItem.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { clsx } from 'clsx';
33

4-
import { isNonNullable } from '../_util/is';
4+
import { isNonNullable, isReactRenderable } from '../_util/is';
55
import { ConfigContext } from '../config-provider';
66
import type { DropdownProps } from '../dropdown/dropdown';
77
import Dropdown from '../dropdown/dropdown';
@@ -94,7 +94,7 @@ export const InternalBreadcrumbItem: React.FC<BreadcrumbItemProps> = (props) =>
9494
>
9595
{link}
9696
</li>
97-
{separator && <BreadcrumbSeparator>{separator}</BreadcrumbSeparator>}
97+
{isReactRenderable(separator) && <BreadcrumbSeparator>{separator}</BreadcrumbSeparator>}
9898
</>
9999
);
100100
}

‎components/breadcrumb/BreadcrumbSeparator.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const BreadcrumbSeparator: CompoundedComponent = ({ children }) => {
2121
style={mergedStyles?.separator}
2222
aria-hidden="true"
2323
>
24-
{children === '' ? children : children || '/'}
24+
{children === '' ? children : children ?? '/'}
2525
</li>
2626
);
2727
};

‎components/breadcrumb/__tests__/Breadcrumb.test.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,4 +452,11 @@ describe('Breadcrumb', () => {
452452
);
453453
getByText('666');
454454
});
455+
456+
it('supports numeric 0 separator', () => {
457+
const { container } = render(
458+
<Breadcrumb separator={0} items={[{ title: 'foo' }, { title: 'bar' }]} />,
459+
);
460+
expect(container.querySelector('.ant-breadcrumb-separator')?.textContent).toBe('0');
461+
});
455462
});

‎components/card/Card.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { clsx } from 'clsx';
55

66
import { useMergeSemantic, useSemanticRootStyle } from '../_util/hooks/useMergeSemantic';
77
import type { GenerateSemantic } from '../_util/hooks/useMergeSemantic/semanticType';
8+
import { isReactRenderable } from '../_util/is';
89
import { devUseWarning } from '../_util/warning';
910
import { useComponentConfig } from '../config-provider/context';
1011
import useSize from '../config-provider/hooks/useSize';
@@ -223,7 +224,7 @@ const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
223224
items={tabList.map(({ tab, ...item }) => ({ label: tab, ...item }))}
224225
/>
225226
) : null;
226-
if (title || extra || tabs) {
227+
if (isReactRenderable(title) || isReactRenderable(extra) || tabs) {
227228
const headClasses = clsx(`${prefixCls}-head`, mergedClassNames.header);
228229
const titleClasses = clsx(`${prefixCls}-head-title`, mergedClassNames.title);
229230
const extraClasses = clsx(`${prefixCls}-extra`, mergedClassNames.extra);
@@ -234,12 +235,12 @@ const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
234235
head = (
235236
<div className={headClasses} style={mergedHeadStyle}>
236237
<div className={`${prefixCls}-head-wrapper`}>
237-
{title && (
238+
{isReactRenderable(title) && (
238239
<div className={titleClasses} style={mergedStyles.title}>
239240
{title}
240241
</div>
241242
)}
242-
{extra && (
243+
{isReactRenderable(extra) && (
243244
<div className={extraClasses} style={mergedStyles.extra}>
244245
{extra}
245246
</div>
@@ -250,7 +251,7 @@ const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
250251
);
251252
}
252253
const coverClasses = clsx(`${prefixCls}-cover`, mergedClassNames.cover);
253-
const coverDom = cover ? (
254+
const coverDom = isReactRenderable(cover) ? (
254255
<div className={coverClasses} style={mergedStyles.cover}>
255256
{cover}
256257
</div>

‎components/card/CardMeta.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { clsx } from 'clsx';
33

44
import { useMergeSemantic, useSemanticRootStyle } from '../_util/hooks/useMergeSemantic';
55
import type { GenerateSemantic } from '../_util/hooks/useMergeSemantic/semanticType';
6+
import { isReactRenderable } from '../_util/is';
67
import { useComponentConfig } from '../config-provider/context';
78

89
export type CardMetaSemanticType = {
@@ -88,19 +89,19 @@ const CardMeta = React.forwardRef<CardMetaRef, CardMetaProps>((props, ref) => {
8889

8990
const sectionClassNames = clsx(`${metaPrefixCls}-section`, mergedClassNames.section);
9091

91-
const avatarDom: React.ReactNode = avatar ? (
92+
const avatarDom: React.ReactNode = isReactRenderable(avatar) ? (
9293
<div className={avatarClassNames} style={mergedStyles.avatar}>
9394
{avatar}
9495
</div>
9596
) : null;
9697

97-
const titleDom: React.ReactNode = title ? (
98+
const titleDom: React.ReactNode = isReactRenderable(title) ? (
9899
<div className={titleClassNames} style={mergedStyles.title}>
99100
{title}
100101
</div>
101102
) : null;
102103

103-
const descriptionDom: React.ReactNode = description ? (
104+
const descriptionDom: React.ReactNode = isReactRenderable(description) ? (
104105
<div className={descriptionClassNames} style={mergedStyles.description}>
105106
{description}
106107
</div>

‎components/card/__tests__/index.test.tsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,4 +360,19 @@ describe('Card', () => {
360360

361361
expect(container).toMatchSnapshot();
362362
});
363+
364+
it('should render numeric 0 for title, extra, and Card.Meta', () => {
365+
const { container } = render(
366+
<Card title={0} extra={0} cover={0}>
367+
<Card.Meta avatar={0} title={0} description={0} />
368+
</Card>,
369+
);
370+
371+
expect(container.querySelector('.ant-card-head-title')?.textContent).toBe('0');
372+
expect(container.querySelector('.ant-card-extra')?.textContent).toBe('0');
373+
expect(container.querySelector('.ant-card-cover')?.textContent).toBe('0');
374+
expect(container.querySelector('.ant-card-meta-avatar')?.textContent).toBe('0');
375+
expect(container.querySelector('.ant-card-meta-title')?.textContent).toBe('0');
376+
expect(container.querySelector('.ant-card-meta-description')?.textContent).toBe('0');
377+
});
363378
});

‎components/float-button/FloatButton.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import convertToTooltipProps from '../_util/convertToTooltipProps';
77
import { useZIndex } from '../_util/hooks';
88
import { useMergeSemantic } from '../_util/hooks/useMergeSemantic';
99
import type { GenerateSemantic } from '../_util/hooks/useMergeSemantic/semanticType';
10+
import { isReactRenderable } from '../_util/is';
1011
import { devUseWarning } from '../_util/warning';
1112
import Badge from '../badge';
1213
import type { BadgeProps } from '../badge';
@@ -133,7 +134,7 @@ const InternalFloatButton = React.forwardRef<FloatButtonElement, FloatButtonProp
133134
);
134135

135136
// ============================= Icon =============================
136-
const mergedIcon = !mergedContent && !icon ? <FileTextOutlined /> : icon;
137+
const mergedIcon = !isReactRenderable(mergedContent) && !icon ? <FileTextOutlined /> : icon;
137138

138139
// ============================ zIndex ============================
139140

@@ -162,7 +163,7 @@ const InternalFloatButton = React.forwardRef<FloatButtonElement, FloatButtonProp
162163
const warning = devUseWarning('FloatButton');
163164

164165
warning(
165-
!(mergedShape === 'circle' && mergedContent),
166+
!(mergedShape === 'circle' && isReactRenderable(mergedContent)),
166167
'usage',
167168
'supported only when `shape` is `square`. Due to narrow space for text, short sentence is recommended.',
168169
);
@@ -188,7 +189,7 @@ const InternalFloatButton = React.forwardRef<FloatButtonElement, FloatButtonProp
188189
{
189190
[`${prefixCls}-rtl`]: direction === 'rtl',
190191
[`${prefixCls}-individual`]: mergedIndividual,
191-
[`${prefixCls}-icon-only`]: !mergedContent,
192+
[`${prefixCls}-icon-only`]: !isReactRenderable(mergedContent),
192193
},
193194
)}
194195
classNames={mergedClassNames}

‎components/float-button/__tests__/index.test.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,10 @@ describe('FloatButton', () => {
129129
const element = container?.querySelector<HTMLButtonElement>('.ant-float-btn');
130130
expect(element?.type).toBe(type);
131131
});
132+
133+
it('should render numeric 0 content without fallback icon', () => {
134+
const { container } = render(<FloatButton content={0} shape="square" />);
135+
expect(container.querySelector('.ant-float-btn-icon-only')).toBeFalsy();
136+
expect(container.querySelector('.ant-float-btn')?.textContent).toContain('0');
137+
});
132138
});

‎components/segmented/__tests__/index.test.tsx‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,5 +387,19 @@ describe('Segmented', () => {
387387
expect(tooltipInnerList[1]?.textContent).toBe('hello Monthly');
388388
});
389389
});
390+
391+
it('should render numeric 0 label when icon is configured', () => {
392+
const { container } = render(
393+
<Segmented
394+
options={[
395+
{ icon: <AppstoreOutlined />, label: 0, value: 'zero' },
396+
{ icon: <BarsOutlined />, label: 'bars', value: 'bars' },
397+
]}
398+
/>,
399+
);
400+
const firstItem = container.querySelector('.ant-segmented-item-label');
401+
expect(firstItem?.textContent).toContain('0');
402+
expect(firstItem?.lastElementChild?.textContent).toBe('0');
403+
});
390404
});
391405
});

‎components/segmented/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { useOrientation } from '../_util/hooks';
1313
import type { Orientation } from '../_util/hooks';
1414
import { useMergeSemantic, useSemanticRootStyle } from '../_util/hooks/useMergeSemantic';
1515
import type { GenerateSemantic } from '../_util/hooks/useMergeSemantic/semanticType';
16-
import { isPlainObject } from '../_util/is';
16+
import { isPlainObject, isReactRenderable } from '../_util/is';
1717
import { useComponentConfig } from '../config-provider/context';
1818
import useSize from '../config-provider/hooks/useSize';
1919
import type { SizeType } from '../config-provider/SizeContext';
@@ -153,7 +153,7 @@ const InternalSegmented = React.forwardRef<HTMLDivElement, SegmentedProps>((prop
153153
>
154154
{icon}
155155
</span>
156-
{label && <span>{label}</span>}
156+
{isReactRenderable(label) && <span>{label}</span>}
157157
</>
158158
),
159159
};

0 commit comments

Comments
 (0)