refactor: Upgrade utils and replace useMergedState

Author: 刘欢

docs/examples/components/TooltipSlider.tsx

@@ -3,7 +3,7 @@ import Slider from 'rc-slider';
 import type { TooltipRef } from 'rc-tooltip';
 import Tooltip from 'rc-tooltip';
 import 'rc-tooltip/assets/bootstrap.css';
-import raf from 'rc-util/lib/raf';
+import raf from '@rc-component/util/lib/raf';
 import * as React from 'react';
 
 interface HandleTooltipProps {

package.json

@@ -43,7 +43,7 @@
   "dependencies": {
     "@babel/runtime": "^7.10.1",
     "classnames": "^2.2.5",
-    "rc-util": "^5.36.0"
+    "@rc-component/util": "^1.3.0"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^1.0.2",

src/Handles/Handle.tsx

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import KeyCode from 'rc-util/lib/KeyCode';
+import KeyCode from '@rc-component/util/lib/KeyCode';
 import * as React from 'react';
 import SliderContext from '../context';
 import type { OnStartMove } from '../interface';

src/Slider.tsx

@@ -1,8 +1,8 @@
+import useControlledState from '@rc-component/util/lib/hooks/useControlledState';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import isEqual from '@rc-component/util/lib/isEqual';
+import warning from '@rc-component/util/lib/warning';
 import cls from 'classnames';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import isEqual from 'rc-util/lib/isEqual';
-import warning from 'rc-util/lib/warning';
 import * as React from 'react';
 import type { HandlesProps, HandlesRef } from './Handles';
 import Handles from './Handles';
@@ -250,9 +250,7 @@ const Slider = React.forwardRef<SliderRef, SliderProps<number | number[]>>((prop
   );
 
   // ============================ Values ============================
-  const [mergedValue, setValue] = useMergedState<number | number[], number[]>(defaultValue, {
-    value,
-  });
+  const [mergedValue, setValue] = useControlledState(defaultValue, value);
 
   const rawValues = React.useMemo(() => {
     const valueList =

src/hooks/useDrag.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import useEvent from 'rc-util/lib/hooks/useEvent';
-import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect';
+import useEvent from '@rc-component/util/lib/hooks/useEvent';
+import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
 import { UnstableContext } from '../context';
 import type { Direction, OnStartMove } from '../interface';
 import type { OffsetValues } from './useOffset';

src/hooks/useRange.ts

@@ -1,4 +1,4 @@
-import { warning } from 'rc-util/lib/warning';
+import { warning } from '@rc-component/util/lib/warning';
 import { useMemo } from 'react';
 import type { SliderProps } from '../Slider';
 

tests/Range.test.tsx

@@ -1,9 +1,9 @@
 /* eslint-disable max-len, no-undef, react/no-string-refs, no-param-reassign, max-classes-per-file */
 import '@testing-library/jest-dom';
 import { createEvent, fireEvent, render } from '@testing-library/react';
-import keyCode from 'rc-util/lib/KeyCode';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
-import { resetWarned } from 'rc-util/lib/warning';
+import keyCode from '@rc-component/util/lib/KeyCode';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
+import { resetWarned } from '@rc-component/util/lib/warning';
 import React from 'react';
 import Slider from '../src';
 

tests/Slider.test.js

@@ -1,8 +1,8 @@
 import '@testing-library/jest-dom';
 import { createEvent, fireEvent, render } from '@testing-library/react';
 import classNames from 'classnames';
-import keyCode from 'rc-util/lib/KeyCode';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import keyCode from '@rc-component/util/lib/KeyCode';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import React from 'react';
 import Slider from '../src/Slider';
 

tests/common.test.js

@@ -1,8 +1,8 @@
 /* eslint-disable max-len, no-undef */
 import '@testing-library/jest-dom';
 import { createEvent, fireEvent, render } from '@testing-library/react';
-import KeyCode from 'rc-util/lib/KeyCode';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import KeyCode from '@rc-component/util/lib/KeyCode';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import React from 'react';
 import Slider from '../src';
 

tests/marks.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len, no-undef */
 import '@testing-library/jest-dom';
 import { fireEvent, render } from '@testing-library/react';
-import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
+import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
 import React from 'react';
 import Slider from '../src';