From ba7a38987932a502a870def1901634f751c20b08 Mon Sep 17 00:00:00 2001 From: LovePlayCode <1244224501@qq.com> Date: Thu, 25 Dec 2025 09:31:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=20MenuItem=20?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B0=86=20label?= =?UTF-8?q?=20=E5=8C=85=E8=A3=85=E5=9C=A8=20span=20=E4=B8=AD=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/nodeUtil.tsx | 8 +++----- tests/__snapshots__/MenuItem.spec.tsx.snap | 12 ++++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/utils/nodeUtil.tsx b/src/utils/nodeUtil.tsx index c0b81106..ec3d5009 100644 --- a/src/utils/nodeUtil.tsx +++ b/src/utils/nodeUtil.tsx @@ -47,13 +47,11 @@ function convertItemsToNodes( if (type === 'divider') { return ; } - + const hasExtra = !!extra || extra === 0; return ( - {label} - {(!!extra || extra === 0) && ( - {extra} - )} + {hasExtra ? {label} : label} + {hasExtra && {extra}} ); } diff --git a/tests/__snapshots__/MenuItem.spec.tsx.snap b/tests/__snapshots__/MenuItem.spec.tsx.snap index dc957d18..c4e28718 100644 --- a/tests/__snapshots__/MenuItem.spec.tsx.snap +++ b/tests/__snapshots__/MenuItem.spec.tsx.snap @@ -22,7 +22,11 @@ exports[`MenuItem overwrite default role should set extra to group option 1`] = role="menuitem" tabindex="-1" > - Menu Item 1 + + Menu Item 1 + @@ -40,7 +44,11 @@ exports[`MenuItem overwrite default role should set extra to option 1`] = ` role="menuitem" tabindex="-1" > - Top Menu Item + + Top Menu Item +