fix: fix the error of missing custom icon className

Wxh16144-forks · Jan 6, 2023 · 71c79a3 · 71c79a3
1 parent 2991e93
commit 71c79a3
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/components/menu/menu.tsx b/components/menu/menu.tsx
@@ -121,14 +121,23 @@ const InternalMenu = forwardRef<RcMenuRef, InternalMenuProps>((props, ref) => {
   const menuClassName = classNames(`${prefixCls}-${theme}`, className);
 
   // ====================== Expand Icon ========================
-  let mergedExpandIcon: MenuProps[`expandIcon`];
-  if (typeof expandIcon === 'function') {
-    mergedExpandIcon = expandIcon;
-  } else {
-    mergedExpandIcon = cloneElement(expandIcon || overrideObj.expandIcon, {
-      className: `${prefixCls}-submenu-expand-icon`,
-    });
-  }
+  const mergedExpandIcon: MenuProps[`expandIcon`] = (expandIconProps) => {
+    const nonUnderwriteExpandIcon: any =
+      typeof expandIcon === 'function'
+        ? expandIcon(expandIconProps)
+        : expandIcon || overrideObj.expandIcon;
+
+    if (nonUnderwriteExpandIcon || nonUnderwriteExpandIcon === 0) {
+      return cloneElement(nonUnderwriteExpandIcon, {
+        className: classNames(
+          `${prefixCls}-submenu-expand-icon`,
+          nonUnderwriteExpandIcon?.props?.className,
+        ),
+      });
+    }
+
+    return <i className={`${prefixCls}-submenu-arrow`} />;
+  };
 
   // ======================== Context ==========================
   const contextValue = React.useMemo<MenuContextProps>(