Merge branch 'master' into master

Author: bombillazo

.github/workflows/react-component-ci.yml

@@ -1,114 +1,6 @@
-name: CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
+name: ✅ test
+on: [push, pull_request]
 jobs:
-  setup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '12'
-
-      - name: cache package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: create package-lock.json
-        run: npm i --package-lock-only
-
-      - name: hack for singe file
-        run: |
-          if [ ! -d "package-temp-dir" ]; then
-            mkdir package-temp-dir
-          fi
-          cp package-lock.json package-temp-dir
-
-      - name: cache node_modules
-        id: node_modules_cache_id
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: install
-        if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
-        run: npm ci
-  
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - name: restore cache from package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: lint
-        run: npm run lint
-
-    needs: setup
-  
-  compile:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - name: restore cache from package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: compile
-        run: npm run compile
-
-    needs: setup
-  
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@master
-
-      - name: restore cache from package-lock.json
-        uses: actions/cache@v2
-        with:
-          path: package-temp-dir
-          key: lock-${{ github.sha }}
-
-      - name: restore cache from node_modules
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
-
-      - name: coverage
-        run: npm test -- --coverage && bash <(curl -s https://codecov.io/bash)
-
-    needs: setup
+  test:
+    uses: react-component/rc-test/.github/workflows/test.yml@main
+    secrets: inherit

.gitignore

@@ -40,3 +40,4 @@ docs-dist/
 .dumi/tmp
 .dumi/tmp-production
 
+bun.lockb

bunfig.toml

@@ -0,0 +1,2 @@
+[install]
+peer = false

docs/demo/input-control.tsx

@@ -1,5 +1,6 @@
 /* eslint no-console:0 */
 import React from 'react';
+import type { ValueType} from 'rc-input-number'
 import InputNumber from 'rc-input-number';
 import '../../assets/index.less';
 
@@ -9,7 +10,7 @@ export default () => {
 
   return (
     <div>
-      <InputNumber
+      <InputNumber<ValueType>
         value={value}
         max={999}
         onChange={(newValue) => {

docs/demo/simple.tsx

@@ -29,7 +29,7 @@ export default () => {
         readOnly={readOnly}
         disabled={disabled}
         keyboard={keyboard}
-        wheel={wheel}
+        changeOnWheel={wheel}
         stringMode={stringMode}
       />
       <p>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-input-number",
-  "version": "9.0.0",
+  "version": "9.2.0",
   "description": "React input-number component",
   "keywords": [
     "react",
@@ -49,14 +49,14 @@
     "@babel/runtime": "^7.10.1",
     "@rc-component/mini-decimal": "^1.0.1",
     "classnames": "^2.2.5",
-    "rc-input": "~1.5.0",
+    "rc-input": "~1.6.0",
     "rc-util": "^5.40.1"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^1.0.1",
     "@swc-node/jest": "^1.5.5",
     "@testing-library/jest-dom": "^6.1.5",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^16.0.0",
     "@types/classnames": "^2.2.9",
     "@types/jest": "^29.2.4",
     "@types/react": "^18.0.26",
@@ -67,16 +67,16 @@
     "cross-env": "^7.0.3",
     "dumi": "^2.0.13",
     "eslint": "^8.54.0",
-    "eslint-plugin-jest": "^27.6.0",
-    "eslint-plugin-unicorn": "^50.0.1",
+    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-unicorn": "^55.0.0",
     "expect.js": "~0.3.1",
     "father": "^4.1.1",
     "glob": "^9.2.1",
     "husky": "^8.0.3",
     "jest-environment-jsdom": "^29.3.1",
     "less": "^4.1.3",
     "lint-staged": "^15.1.0",
-    "np": "^9.2.0",
+    "np": "^10.0.5",
     "rc-test": "^7.0.14",
     "rc-tooltip": "^6.0.1",
     "react": "^18.2.0",

src/hooks/useCursor.ts

@@ -50,10 +50,10 @@ export default function useCursor(
 
         let startPos = value.length;
 
-        if (value.endsWith(afterTxt)) {
-          startPos = value.length - selectionRef.current.afterTxt.length;
-        } else if (value.startsWith(beforeTxt)) {
+        if (value.startsWith(beforeTxt)) {
           startPos = beforeTxt.length;
+        } else if (value.endsWith(afterTxt)) {
+          startPos = value.length - selectionRef.current.afterTxt.length;
         } else {
           const beforeLastChar = beforeTxt[start - 1];
           const newIndex = value.indexOf(beforeLastChar, start - 1);

tests/cursor.test.tsx

@@ -107,4 +107,14 @@ describe('InputNumber.Cursor', () => {
       });
     });
   });
+
+  describe('append string', () => {
+    it('position caret before appended characters', () => {
+      const { container } = render(<InputNumber formatter={(value) => `${value}%`} parser={(value) => value.replace('%', '')} />);
+      const input = container.querySelector('input');
+      fireEvent.focus(input);
+      fireEvent.change(input,{ target: { value: '5' } });
+      expect(cursorInput(input)).toEqual(1);
+    });
+  });
 });

tests/props.test.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import '@testing-library/jest-dom';
 import { render, fireEvent } from '@testing-library/react';
 import KeyCode from 'rc-util/lib/KeyCode';
+import type { ValueType } from '../src'
 import InputNumber from '../src';
 
 describe('InputNumber.Props', () => {
@@ -275,7 +276,7 @@ describe('InputNumber.Props', () => {
     });
 
     it('default value can be a string greater than 16 characters', () => {
-      const { container } = render(<InputNumber max={10} defaultValue='-3.637978807091713e-12' />);
+      const { container } = render(<InputNumber<ValueType> max={10} defaultValue='-3.637978807091713e-12' />);
       const input = container.querySelector('input');
       expect(input.value).toEqual('-0.000000000003637978807091713');
     });
@@ -303,7 +304,7 @@ describe('InputNumber.Props', () => {
     });
 
     it('value can be a string greater than 16 characters', () => {
-      const { container } = render(<InputNumber max={10} value='-3.637978807091713e-12' />);
+      const { container } = render(<InputNumber<ValueType> max={10} value='-3.637978807091713e-12' />);
       const input = container.querySelector('input');
       expect(input.value).toEqual('-0.000000000003637978807091713');
     });