Merge pull request #273 from arco-design/fix-stepper-value

fix: `stepper` controlled value
arco-design · Jun 26, 2024 · 2325a7a · 2325a7a
2 parents f081b14 + 4f8d060
commit 2325a7a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/packages/arcodesign/components/stepper/hooks/useInputEvent.tsx b/packages/arcodesign/components/stepper/hooks/useInputEvent.tsx
@@ -6,6 +6,7 @@ export default function useInputEvent(
     params: Required<Pick<StepperProps, 'defaultValue' | 'min' | 'max' | 'digits' | 'allowEmpty'>> &
         Pick<StepperProps, 'onBlur' | 'onChange' | 'onInput'> & {
             actualInputValue: number;
+            innerValue: number;
             updateValue: (updater: number | ((oldValue: number) => number)) => void;
         },
 ) {
@@ -15,6 +16,7 @@ export default function useInputEvent(
         max,
         digits,
         actualInputValue,
+        innerValue,
         allowEmpty,
         updateValue,
         onBlur,
@@ -53,8 +55,8 @@ export default function useInputEvent(
     };
 
     useUpdateEffect(() => {
-        onChange && onChange(actualInputValue);
-    }, [actualInputValue]);
+        onChange && onChange(innerValue);
+    }, [innerValue]);
 
     return {
         handleInput,

diff --git a/packages/arcodesign/components/stepper/hooks/useValue.tsx b/packages/arcodesign/components/stepper/hooks/useValue.tsx
@@ -37,5 +37,6 @@ export default function useValue(
         updateValue,
         actualInputValue,
         showValue,
+        innerValue,
     };
 }
diff --git a/packages/arcodesign/components/stepper/index.tsx b/packages/arcodesign/components/stepper/index.tsx
@@ -41,7 +41,7 @@ const Stepper = forwardRef((props: StepperProps, ref: Ref<StepperRef>) => {
 
     // 值的相关逻辑
     // @en The logic is that handle value
-    const { updateValue, actualInputValue, showValue } = useValue({
+    const { updateValue, actualInputValue, showValue, innerValue } = useValue({
         defaultValue,
         formatter,
         min,
@@ -75,6 +75,7 @@ const Stepper = forwardRef((props: StepperProps, ref: Ref<StepperRef>) => {
         digits,
         actualInputValue,
         allowEmpty,
+        innerValue,
         updateValue,
         onBlur,
         onChange,

diff --git a/packages/arcodesign/tokens/app/arcodesign/default/index.js b/packages/arcodesign/tokens/app/arcodesign/default/index.js
@@ -7,7 +7,7 @@ exports["default"] = void 0;
 exports.getRem = getRem;
 
 function getRem(px, baseFontSize) {
-  var num = Math.round(px / Number(baseFontSize) * 1000000) / 1000000;
+  var num = Math.round(px / Number(baseFontSize) * 1e6) / 1e6;
   return num ? "".concat(num, "rem") : num;
 }
 

diff --git a/packages/arcodesign/tokens/mixin/index.less b/packages/arcodesign/tokens/mixin/index.less
@@ -156,7 +156,7 @@
  * @param @rules {en} customized rewrite rules, default to initial
  * @example
  * ```
- * @import '@arco-design/mobile-utils/style/mixin.less';
+ * @import '@arco-design/mobile-react/style/mixin.less';
  *
  * .demo {
  *   .set-prop-with-rtl(right, auto);
@@ -183,7 +183,7 @@
  * @param @value {en} css property value
  * @example
  * ```
- * @import '@arco-design/mobile-utils/style/mixin.less';
+ * @import '@arco-design/mobile-react/style/mixin.less';
  *
  * .demo {
  *   .set-value-with-rtl(text-align, left);