From 4f8160d013008ac970e0c363bd6f518b5072e4cd Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Fri, 28 Feb 2025 12:29:53 +0800
Subject: [PATCH] Fix disabled buttons

---
 .../src/number-field/decrement/NumberFieldDecrement.tsx   | 8 ++++++--
 .../src/number-field/increment/NumberFieldIncrement.tsx   | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/react/src/number-field/decrement/NumberFieldDecrement.tsx b/packages/react/src/number-field/decrement/NumberFieldDecrement.tsx
index 6b3169a8ab..665d03564b 100644
--- a/packages/react/src/number-field/decrement/NumberFieldDecrement.tsx
+++ b/packages/react/src/number-field/decrement/NumberFieldDecrement.tsx
@@ -17,7 +17,7 @@ const NumberFieldDecrement = React.forwardRef(function NumberFieldDecrement(
   props: NumberFieldDecrement.Props,
   forwardedRef: React.ForwardedRef<HTMLButtonElement>,
 ) {
-  const { render, className, ...otherProps } = props;
+  const { render, className, disabled: disabledProp = false, ...otherProps } = props;
 
   const {
     allowInputSyncRef,
@@ -50,7 +50,7 @@ const NumberFieldDecrement = React.forwardRef(function NumberFieldDecrement(
     maxWithDefault,
     value,
     inputValue,
-    disabled,
+    disabled: disabledProp || disabled,
     readOnly,
     id,
     setValue,
@@ -102,6 +102,10 @@ NumberFieldDecrement.propTypes /* remove-proptypes */ = {
    * returns a class based on the component’s state.
    */
   className: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
+  /**
+   * @ignore
+   */
+  disabled: PropTypes.bool,
   /**
    * Allows you to replace the component’s HTML element
    * with a different tag, or compose it with another component.
diff --git a/packages/react/src/number-field/increment/NumberFieldIncrement.tsx b/packages/react/src/number-field/increment/NumberFieldIncrement.tsx
index 42635cf7b8..7352d8992e 100644
--- a/packages/react/src/number-field/increment/NumberFieldIncrement.tsx
+++ b/packages/react/src/number-field/increment/NumberFieldIncrement.tsx
@@ -17,7 +17,7 @@ const NumberFieldIncrement = React.forwardRef(function NumberFieldIncrement(
   props: NumberFieldIncrement.Props,
   forwardedRef: React.ForwardedRef<HTMLButtonElement>,
 ) {
-  const { render, className, ...otherProps } = props;
+  const { render, className, disabled: disabledProp = false, ...otherProps } = props;
 
   const {
     state,
@@ -50,7 +50,7 @@ const NumberFieldIncrement = React.forwardRef(function NumberFieldIncrement(
     maxWithDefault,
     value,
     inputValue,
-    disabled,
+    disabled: disabledProp || disabled,
     readOnly,
     id,
     setValue,
@@ -102,6 +102,10 @@ NumberFieldIncrement.propTypes /* remove-proptypes */ = {
    * returns a class based on the component’s state.
    */
   className: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
+  /**
+   * @ignore
+   */
+  disabled: PropTypes.bool,
   /**
    * Allows you to replace the component’s HTML element
    * with a different tag, or compose it with another component.