Skip to content

Commit 03f3925

Browse files
committed
fix: wrap item label when extra exists
1 parent 27f1a78 commit 03f3925

2 files changed

Lines changed: 19 additions & 5 deletions

File tree

src/utils/nodeUtil.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,17 @@ function convertItemsToNodes(
4848
return <MergedDivider key={mergedKey} {...restProps} />;
4949
}
5050

51+
const hasExtra = !!extra || extra === 0;
52+
5153
return (
5254
<MergedMenuItem key={mergedKey} {...restProps} extra={extra}>
53-
{label}
54-
{(!!extra || extra === 0) && (
55-
<span className={`${prefixCls}-item-extra`}>{extra}</span>
55+
{hasExtra ? (
56+
<>
57+
<span className={`${prefixCls}-item-label`}>{label}</span>
58+
<span className={`${prefixCls}-item-extra`}>{extra}</span>
59+
</>
60+
) : (
61+
label
5662
)}
5763
</MergedMenuItem>
5864
);

tests/__snapshots__/MenuItem.spec.tsx.snap

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ exports[`MenuItem overwrite default role should set extra to group option 1`] =
2222
role="menuitem"
2323
tabindex="-1"
2424
>
25-
Menu Item 1
25+
<span
26+
class="rc-menu-item-label"
27+
>
28+
Menu Item 1
29+
</span>
2630
<span
2731
class="rc-menu-item-extra"
2832
>
@@ -40,7 +44,11 @@ exports[`MenuItem overwrite default role should set extra to option 1`] = `
4044
role="menuitem"
4145
tabindex="-1"
4246
>
43-
Top Menu Item
47+
<span
48+
class="rc-menu-item-label"
49+
>
50+
Top Menu Item
51+
</span>
4452
<span
4553
class="rc-menu-item-extra"
4654
>

0 commit comments

Comments
 (0)