fix(Button): update disabled prop logic to consider loading state

channel-io · Dec 2, 2024 · f1def31 · f1def31
1 parent 0d72460
commit f1def31
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/bezier-react/src/components/Button/Button.tsx b/packages/bezier-react/src/components/Button/Button.tsx
@@ -95,7 +95,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
       className,
       text,
       loading = false,
-      disabled = loading,
+      disabled: disabledProp = false,
       active = false,
       size = 'm',
       styleVariant = 'primary',
@@ -109,6 +109,8 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
   ) {
     const Comp = as as typeof BaseButton
 
+    const disabled = loading || disabledProp
+
     const handleClick = useCallback<React.MouseEventHandler<HTMLButtonElement>>(
       (event) => {
         if (!disabled) {