Remove defaultProps from Button and clean up some prop handling

airbytehq · Jan 3, 2023 · fa3ab45 · fa3ab45
1 parent 617fca1
commit fa3ab45
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/airbyte-webapp/src/components/ui/Button/Button.tsx b/airbyte-webapp/src/components/ui/Button/Button.tsx
@@ -8,19 +8,21 @@ import { ButtonProps } from "./types";
 
 export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>((props, ref) => {
   const {
+    full = false,
+    size = "xs",
+    iconPosition = "left",
+    variant = "primary",
     children,
     className,
     clickable,
-    full,
     icon,
-    iconPosition,
     isLoading,
-    size,
-    variant,
     wasActive,
     width,
+    disabled,
     ...buttonProps
   } = props;
+
   const buttonStyles = {
     [styles.full]: full,
     [styles.isLoading]: isLoading,
@@ -34,17 +36,16 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>((props, r
     [styles.typeSecondary]: variant === "secondary",
     [styles.typeDark]: variant === "dark",
   };
-  const widthStyle: { width?: string } = {};
-  if (width) {
-    widthStyle.width = `${width}px`;
-  }
+
+  const widthStyle: React.CSSProperties = width ? { width: `${width}px` } : {};
+
   return (
     <button
       ref={ref}
       style={widthStyle}
       className={classNames(styles.button, className, buttonStyles)}
+      disabled={disabled || isLoading}
       {...buttonProps}
-      disabled={buttonProps.disabled || isLoading}
     >
       {isLoading && (
         <FontAwesomeIcon
@@ -76,10 +77,3 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>((props, r
     </button>
   );
 });
-
-Button.defaultProps = {
-  full: false,
-  size: "xs",
-  variant: "primary",
-  iconPosition: "left",
-};