Merge branch 'react-component:master' into master

Author: bombillazo

.dumirc.ts

@@ -8,7 +8,7 @@ export default defineConfig({
     name: 'InputNumber',
     logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'
   },
-  outputPath: '.doc',
+  outputPath: 'docs-dist',
   exportStatic: {},
   styles: [`body .dumi-default-header-left { width: 230px; } body .dumi-default-hero-title { font-size: 100px; }`],
 });

.gitignore

@@ -28,7 +28,7 @@ coverage
 yarn.lock
 pnpm-lock.yaml
 package-lock.json
-.doc/
+docs-dist/
 
 # umi
 .umi

README.md

@@ -112,12 +112,6 @@ online example: https://input-number.vercel.app/
           <td>false</td>
           <td>Specifies that an InputNumber should be disabled</td>
         </tr>
-        <tr>
-          <td>focusOnUpDown</td>
-          <td>Boolean</td>
-          <td>true</td>
-          <td>whether focus input when click up or down button</td>
-        </tr>
         <tr>
           <td>required</td>
           <td>Boolean</td>

docs/api.md

@@ -64,12 +64,6 @@ nav:
           <td>false</td>
           <td>Specifies that an InputNumber should be disabled</td>
         </tr>
-        <tr>
-          <td>focusOnUpDown</td>
-          <td>Boolean</td>
-          <td>true</td>
-          <td>whether focus input when click up or down button</td>
-        </tr>
         <tr>
           <td>required</td>
           <td>Boolean</td>

docs/demo/simple-use-touch.tsx

@@ -37,10 +37,6 @@ nav:
 
 <code src="./demo/precision.tsx"></code>
 
-## simple-use-touch
-
-<code src="./demo/simple-use-touch.tsx"></code>
-
 ## small-step
 
 <code src="./demo/small-step.tsx"></code>

docs/example.md

@@ -5,10 +5,7 @@
     {
       "src": "package.json",
       "use": "@now/static-build",
-      "config": { "distDir": ".doc" }
+      "config": { "distDir": "docs-dist" }
     }
-  ],
-  "routes": [
-    { "src": "/(.*)", "dest": "/dist/$1" }
   ]
 }

now.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-input-number",
-  "version": "8.5.0",
+  "version": "8.6.1",
   "description": "React input-number component",
   "keywords": [
     "react",
@@ -49,13 +49,13 @@
     "@babel/runtime": "^7.10.1",
     "@rc-component/mini-decimal": "^1.0.1",
     "classnames": "^2.2.5",
-    "rc-input": "~1.3.5",
+    "rc-input": "~1.4.0",
     "rc-util": "^5.28.0"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^1.0.1",
     "@swc-node/jest": "^1.5.5",
-    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/jest-dom": "^6.1.5",
     "@testing-library/react": "^14.0.0",
     "@types/classnames": "^2.2.9",
     "@types/jest": "^29.2.4",
@@ -66,22 +66,24 @@
     "@umijs/test": "^4.0.36",
     "cross-env": "^7.0.3",
     "dumi": "^2.0.13",
-    "eslint": "^7.1.0",
+    "eslint": "^8.54.0",
+    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-unicorn": "^50.0.1",
     "expect.js": "~0.3.1",
     "father": "^4.1.1",
     "glob": "^9.2.1",
     "husky": "^8.0.3",
     "jest-environment-jsdom": "^29.3.1",
-    "less": "^3.12.2",
-    "lint-staged": "^13.2.0",
-    "np": "^7.2.0",
+    "less": "^4.1.3",
+    "lint-staged": "^15.1.0",
+    "np": "^9.2.0",
     "rc-test": "^7.0.14",
     "rc-tooltip": "^6.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "regenerator-runtime": "^0.13.7",
+    "regenerator-runtime": "^0.14.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "typescript": "^5.1.6"
   },
   "peerDependencies": {
     "react": ">=16.9.0",

package.json

@@ -17,6 +17,7 @@ import { getDecupleSteps } from './utils/numberUtil';
 
 import { InputFocusOptions, triggerFocus } from 'rc-input/lib/utils/commonUtils';
 import useFrame from './hooks/useFrame';
+import { BaseInputProps } from 'rc-input/lib/interface';
 
 export type { ValueType };
 
@@ -67,15 +68,7 @@ export interface InputNumberProps<T extends ValueType = ValueType>
   suffix?: React.ReactNode;
   addonBefore?: React.ReactNode;
   addonAfter?: React.ReactNode;
-  classes?: {
-    affixWrapper?: string;
-    group?: string;
-    wrapper?: string;
-  };
-  classNames?: {
-    affixWrapper?: string;
-    group?: string;
-    wrapper?: string;
+  classNames?: BaseInputProps['classNames'] & {
     input?: string;
   };
 
@@ -105,9 +98,6 @@ export interface InputNumberProps<T extends ValueType = ValueType>
 
   onStep?: (value: T, info: { offset: ValueType; type: 'up' | 'down' }) => void;
 
-  // focusOnUpDown: boolean;
-  // useTouch: boolean;
-
   /**
    * Trigger change onBlur event.
    * If disabled, user must press enter or click handler to confirm the value update
@@ -606,7 +596,7 @@ const InternalInputNumber = React.forwardRef(
     // ============================ Render ============================
     return (
       <div
-        className={clsx(prefixCls, classNames?.input, className, {
+        className={clsx(prefixCls, className, {
           [`${prefixCls}-focused`]: focus,
           [`${prefixCls}-disabled`]: disabled,
           [`${prefixCls}-readonly`]: readOnly,
@@ -667,7 +657,6 @@ const InputNumber = React.forwardRef(
       suffix,
       addonBefore,
       addonAfter,
-      classes,
       className,
       classNames,
       ...rest
@@ -683,15 +672,6 @@ const InputNumber = React.forwardRef(
 
     return (
       <BaseInput
-        inputElement={
-          <InternalInputNumber
-            prefixCls={prefixCls}
-            disabled={disabled}
-            classNames={classNames}
-            ref={composeRef(inputFocusRef, ref)}
-            {...rest}
-          />
-        }
         className={className}
         triggerFocus={focus}
         prefixCls={prefixCls}
@@ -702,15 +682,22 @@ const InputNumber = React.forwardRef(
         suffix={suffix}
         addonAfter={addonAfter}
         addonBefore={addonBefore}
-        classes={classes}
         classNames={classNames}
         components={{
           affixWrapper: 'div',
           groupWrapper: 'div',
           wrapper: 'div',
           groupAddon: 'div',
         }}
-      />
+      >
+        <InternalInputNumber
+          prefixCls={prefixCls}
+          disabled={disabled}
+          ref={composeRef(inputFocusRef, ref)}
+          className={classNames?.input}
+          {...rest}
+        />
+      </BaseInput>
     );
   },
 ) as (<T extends ValueType = ValueType>(