Skip to content

Commit 134960a

Browse files
authored
fix(TreeViewListItem): customBadgeContent of number 0 will display (#11848)
1 parent 9d843f9 commit 134960a

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

packages/react-core/src/components/TreeView/TreeViewListItem.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,7 @@ const TreeViewListItemBase: React.FunctionComponent<TreeViewListItemProps> = ({
186186
<>
187187
{hasBadge && children && (
188188
<span className={css(styles.treeViewNodeCount)}>
189-
<Badge {...badgeProps}>
190-
{customBadgeContent ? customBadgeContent : (children as React.ReactElement<any>).props.data.length}
191-
</Badge>
189+
<Badge {...badgeProps}>{customBadgeContent ?? (children as React.ReactElement<any>).props.data.length}</Badge>
192190
</span>
193191
)}
194192
{hasBadge && !children && customBadgeContent !== undefined && (

packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,16 @@ test('Renders badge with customBadgeContent when hasBadge and children are passe
264264
expect(screen.getByText(requiredProps.name).nextElementSibling).toHaveTextContent('Custom badge');
265265
});
266266

267+
test('Renders badge with customBadgeContent being number 0 when hasBadge and children are passed', () => {
268+
render(
269+
<TreeViewListItem hasBadge customBadgeContent={0} {...requiredProps}>
270+
<TreeView data={[{ name: 'Parent name 1' }, { name: 'Parent name 2' }]} />
271+
</TreeViewListItem>
272+
);
273+
274+
expect(screen.getByText(requiredProps.name).nextElementSibling).toHaveTextContent('0');
275+
});
276+
267277
test('Renders badge with customBadgeContent when hasBadge is passed and children are not passed', () => {
268278
render(<TreeViewListItem hasBadge customBadgeContent="Custom badge" {...requiredProps} />);
269279

0 commit comments

Comments
 (0)