chore: optimize condition flow in Button (#14469)

carbon-design-system · Aug 24, 2023 · d936b98 · d936b98
1 parent eb3b542
commit d936b98
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/packages/react/src/components/Button/Button.tsx b/packages/react/src/components/Button/Button.tsx
@@ -221,24 +221,24 @@ const Button = React.forwardRef(function Button<T extends React.ElementType>(
     otherProps = anchorProps;
   }
 
-  const Button = React.createElement(
-    component,
-    {
-      onMouseEnter,
-      onMouseLeave,
-      onFocus,
-      onBlur,
-      onClick,
-      ...rest,
-      ...commonProps,
-      ...otherProps,
-    },
-    assistiveText,
-    children,
-    buttonImage
-  );
-
-  if (hasIconOnly) {
+  if (!hasIconOnly) {
+    return React.createElement(
+      component,
+      {
+        onMouseEnter,
+        onMouseLeave,
+        onFocus,
+        onBlur,
+        onClick,
+        ...rest,
+        ...commonProps,
+        ...otherProps,
+      },
+      assistiveText,
+      children,
+      buttonImage
+    );
+  } else {
     let align: PopoverAlignment | undefined = undefined;
 
     if (tooltipPosition === 'top' || tooltipPosition === 'bottom') {
@@ -276,7 +276,6 @@ const Button = React.forwardRef(function Button<T extends React.ElementType>(
       </IconButton>
     );
   }
-  return Button;
 });
 
 Button.displayName = 'Button';