fix: add extra pass

react-component · Oct 24, 2024 · e5ce601 · e5ce601
1 parent d7bb0e0
commit e5ce601
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/assets/index.less b/assets/index.less
@@ -104,7 +104,7 @@
     display: flex;
     align-items: center;
 
-    .@{menuPrefixCls}-extra {
+    .@{menuPrefixCls}-item-extra {
       margin-left: auto;
       font-size: 14px;
     }

diff --git a/src/MenuItem.tsx b/src/MenuItem.tsx
@@ -16,7 +16,7 @@ import type { MenuInfo, MenuItemType } from './interface';
 import { warnItemProp } from './utils/warnUtil';
 
 export interface MenuItemProps
-  extends Omit<MenuItemType, 'label' | 'key'| 'ref'>,
+  extends Omit<MenuItemType, 'label' | 'key' | 'ref'>,
     Omit<
       React.HTMLAttributes<HTMLLIElement>,
       'onClick' | 'onMouseEnter' | 'onMouseLeave' | 'onSelect'
@@ -209,7 +209,7 @@ const InternalMenuItem = React.forwardRef(
         role={role === null ? 'none' : role || 'menuitem'}
         tabIndex={disabled ? null : -1}
         data-menu-id={overflowDisabled && domDataId ? null : domDataId}
-        {...restProps}
+        {...omit(restProps, ['extra'])}
         {...activeProps}
         {...optionRoleProps}
         component="li"

diff --git a/src/utils/nodeUtil.tsx b/src/utils/nodeUtil.tsx
@@ -49,7 +49,7 @@ function convertItemsToNodes(
         }
 
         return (
-          <MergedMenuItem key={mergedKey} {...restProps}>
+          <MergedMenuItem key={mergedKey} {...restProps} extra={extra}>
             {label}
             {(!!extra || extra === 0) && (
               <span className={`${prefixCls}-item-extra`}>{extra}</span>