Avoid rc package deep imports (#732)

* fix: avoid rc package deep imports

* chore: address import review comments

Author: QDyanbing

package.json

@@ -46,11 +46,11 @@
   },
   "dependencies": {
     "@rc-component/mini-decimal": "^1.1.1",
-    "@rc-component/util": "^1.4.0",
+    "@rc-component/util": "^1.11.1",
     "clsx": "^2.1.1"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^2.0.2",
+    "@rc-component/father-plugin": "^2.2.0",
     "@rc-component/np": "^1.0.3",
     "@swc-node/jest": "^1.5.5",
     "@testing-library/jest-dom": "^6.1.5",

src/InputNumber.tsx

@@ -6,16 +6,19 @@ import getMiniDecimal, {
   validateNumber,
   ValueType,
 } from '@rc-component/mini-decimal';
-import { useLayoutUpdateEffect } from '@rc-component/util/lib/hooks/useLayoutEffect';
-import proxyObject from '@rc-component/util/lib/proxyObject';
+import {
+  type InputFocusOptions,
+  proxyObject,
+  triggerFocus,
+  useEvent,
+  useLayoutUpdateEffect,
+} from '@rc-component/util';
 import { clsx } from 'clsx';
 import * as React from 'react';
 import useCursor from './hooks/useCursor';
 import StepHandler from './StepHandler';
 import { getDecupleSteps } from './utils/numberUtil';
 
-import { useEvent } from '@rc-component/util';
-import { triggerFocus, type InputFocusOptions } from '@rc-component/util/lib/Dom/focus';
 import useFrame from './hooks/useFrame';
 
 export type { ValueType };

src/StepHandler.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable react/no-unknown-property */
-import raf from '@rc-component/util/lib/raf';
+import { raf } from '@rc-component/util';
 import { clsx } from 'clsx';
 import * as React from 'react';
 

src/hooks/useCursor.ts

@@ -1,5 +1,5 @@
+import { warning } from '@rc-component/util';
 import { useRef } from 'react';
-import warning from '@rc-component/util/lib/warning';
 /**
  * Keep input cursor in the correct position if possible.
  * Is this necessary since we have `formatter` which may mass the content?

src/hooks/useFrame.ts

@@ -1,5 +1,5 @@
-import { useRef, useEffect } from 'react';
-import raf from '@rc-component/util/lib/raf';
+import { raf } from '@rc-component/util';
+import { useEffect, useRef } from 'react';
 
 /**
  * Always trigger latest once when call multiple time

tests/click.test.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render, fireEvent, act } from '@testing-library/react';
 import InputNumber, { InputNumberProps } from '../src';
-import KeyCode from '@rc-component/util/lib/KeyCode';
+import { KeyCode } from '@rc-component/util';
 
 jest.mock('@rc-component/mini-decimal/lib/supportUtil');
 const { supportBigInt } = require('@rc-component/mini-decimal/lib/supportUtil');
@@ -37,7 +37,7 @@ describe('InputNumber.Click', () => {
       fireEvent.click(container.querySelector(selector));
       expect(onChange).toHaveBeenCalledTimes(1);
       expect(onChange).toHaveBeenCalledWith(changedValue);
-      expect(onStep).toHaveBeenCalledWith(changedValue, { offset: 1, type: stepType, emitter  });
+      expect(onStep).toHaveBeenCalledWith(changedValue, { offset: 1, type: stepType, emitter });
       unmount();
     });
   }
@@ -186,7 +186,7 @@ describe('InputNumber.Click', () => {
     });
 
     expect(onChange).toHaveBeenCalledWith(1.1);
-    expect(onStep).toHaveBeenCalledWith(1.1, { offset: '0.1', type: 'down', emitter: 'keyboard'  });
+    expect(onStep).toHaveBeenCalledWith(1.1, { offset: '0.1', type: 'down', emitter: 'keyboard' });
   });
 
   it('click up button with pressing shift key', () => {

tests/cursor.test.tsx

@@ -1,11 +1,10 @@
+import { KeyCode } from '@rc-component/util';
 import React from 'react';
-import KeyCode from '@rc-component/util/lib/KeyCode';
-import { render, fireEvent } from './util/wrapper';
 import InputNumber from '../src';
+import { fireEvent, render } from './util/wrapper';
 
 describe('InputNumber.Cursor', () => {
   function cursorInput(input: HTMLInputElement, pos?: number) {
-
     if (pos !== undefined) {
       input.setSelectionRange(pos, pos);
     }
@@ -17,12 +16,12 @@ describe('InputNumber.Cursor', () => {
     changeValue: string,
     cursorPos: number,
     which?: number,
-    key?: number|string,
+    key?: number | string,
   ) {
-    fireEvent.focus(input)
-    fireEvent.keyDown(input,{which,keyCode:which,key})
-    fireEvent.change(input,{ target: { value: changeValue, selectionStart: 1 }})
-    fireEvent.keyUp(input,{which,keyCode:which,key})
+    fireEvent.focus(input);
+    fireEvent.keyDown(input, { which, keyCode: which, key });
+    fireEvent.change(input, { target: { value: changeValue, selectionStart: 1 } });
+    fireEvent.keyUp(input, { which, keyCode: which, key });
   }
 
   // https://github.com/react-component/input-number/issues/235
@@ -42,12 +41,14 @@ describe('InputNumber.Cursor', () => {
   describe('pre-pend string', () => {
     it('quick typing', () => {
       // `$ ` => `9$ ` => `$ 9`
-      const { container } = render(<InputNumber defaultValue="$ " formatter={(val) => `$ ${val}`} />);
+      const { container } = render(
+        <InputNumber defaultValue="$ " formatter={(val) => `$ ${val}`} />,
+      );
       const input = container.querySelector('input');
-      fireEvent.focus(input)
+      fireEvent.focus(input);
       cursorInput(input, 0);
-      changeOnPos(input, '9$ ', 1, KeyCode.NUM_ONE,'1');
-      expect(cursorInput(input,3)).toEqual(3);
+      changeOnPos(input, '9$ ', 1, KeyCode.NUM_ONE, '1');
+      expect(cursorInput(input, 3)).toEqual(3);
     });
 
     describe('[LEGACY]', () => {
@@ -70,50 +71,55 @@ describe('InputNumber.Cursor', () => {
 
         const { container } = render(<Demo />);
         const input = container.querySelector('input');
-        fireEvent.focus(input)
+        fireEvent.focus(input);
         for (let i = 0; i < prependValue.length; i += 1) {
-          fireEvent.keyDown(input,{which: KeyCode.ONE,keyCode: KeyCode.ONE})
+          fireEvent.keyDown(input, { which: KeyCode.ONE, keyCode: KeyCode.ONE });
         }
 
         const finalValue = prependValue + initValue;
         cursorInput(input, prependValue.length);
-        fireEvent.change(input,{ target: { value: finalValue } });
+        fireEvent.change(input, { target: { value: finalValue } });
 
         return input;
       };
 
       it('should fix caret position on case 1', () => {
         // '$ 1'
         const input = setUpCursorTest('', '1');
-        expect(cursorInput(input,3)).toEqual(3);
+        expect(cursorInput(input, 3)).toEqual(3);
       });
 
       it('should fix caret position on case 2', () => {
         // '$ 111'
         const input = setUpCursorTest('', '111');
-        expect(cursorInput(input,5)).toEqual(5);
+        expect(cursorInput(input, 5)).toEqual(5);
       });
 
       it('should fix caret position on case 3', () => {
         // '$ 111'
         const input = setUpCursorTest('1', '11');
-        expect(cursorInput(input,4)).toEqual(4);
+        expect(cursorInput(input, 4)).toEqual(4);
       });
 
       it('should fix caret position on case 4', () => {
         // '$ 123,456'
         const input = setUpCursorTest('456', '123');
-        expect(cursorInput(input,6)).toEqual(6);
+        expect(cursorInput(input, 6)).toEqual(6);
       });
     });
   });
 
   describe('append string', () => {
     it('position caret before appended characters', () => {
-      const { container } = render(<InputNumber formatter={(value) => `${value}%`} parser={(value) => value.replace('%', '')} />);
+      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' } });
+      fireEvent.change(input, { target: { value: '5' } });
       expect(cursorInput(input)).toEqual(1);
     });
   });

tests/focus.test.tsx

@@ -1,7 +1,7 @@
+import { spyElementPrototypes } from '@rc-component/util';
 import { fireEvent, render } from '@testing-library/react';
-import InputNumber, { InputNumberRef } from '../src';
-import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import React from 'react';
+import InputNumber, { InputNumberRef } from '../src';
 
 const getInputRef = () => {
   const ref = React.createRef<InputNumberRef>();

tests/formatter.test.tsx

@@ -1,4 +1,4 @@
-import KeyCode from '@rc-component/util/lib/KeyCode';
+import { KeyCode } from '@rc-component/util';
 import React from 'react';
 import InputNumber from '../src';
 import { fireEvent, render } from './util/wrapper';

tests/github.test.tsx

@@ -1,4 +1,4 @@
-import KeyCode from '@rc-component/util/lib/KeyCode';
+import { KeyCode } from '@rc-component/util';
 import React from 'react';
 import InputNumber from '../src';
 import { act, fireEvent, render, screen, waitFor } from './util/wrapper';