feat: optimize code

react-component · Aug 31, 2023 · 913e53f · 913e53f
1 parent 9f076da
commit 913e53f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Icon.tsx b/src/Icon.tsx
@@ -11,6 +11,10 @@ export interface IconProps {
 export default function Icon({ icon, props, children }: IconProps) {
   let iconNode: React.ReactElement;
 
+  if (icon === null || icon === false) {
+    return null;
+  }
+
   if (typeof icon === 'function') {
     iconNode = React.createElement(icon as any, {
       ...props,

diff --git a/src/SubMenu/index.tsx b/src/SubMenu/index.tsx
@@ -121,7 +121,6 @@ const InternalSubMenu = (props: SubMenuProps) => {
   // ================================ Icon ================================
   const mergedItemIcon = itemIcon ?? contextItemIcon;
   const mergedExpandIcon = expandIcon ?? contextExpandIcon;
-  const expandable = mergedExpandIcon !== null && mergedExpandIcon !== false;
 
   // ================================ Open ================================
   const originOpen = openKeys.includes(eventKey);
@@ -248,9 +247,8 @@ const InternalSubMenu = (props: SubMenuProps) => {
       {title}
 
       {/* Only non-horizontal mode shows the icon */}
-      {expandable && (
-        <Icon
-          icon={mode !== 'horizontal' ? mergedExpandIcon : null}
+      <Icon
+          icon={mode !== 'horizontal' ? mergedExpandIcon : undefined}
           props={{
             ...props,
             isOpen: open,
@@ -260,7 +258,6 @@ const InternalSubMenu = (props: SubMenuProps) => {
         >
           <i className={`${subMenuPrefixCls}-arrow`} />
         </Icon>
-      )}
 
     </div>
   );