diff --git a/.eslintrc.js b/.eslintrc.js index 1cb92ecf4..f4de1ffb8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,4 +17,4 @@ module.exports = { 'jsx-a11y/label-has-for': 0, 'jsx-a11y/label-has-associated-control': 0, }, -}; \ No newline at end of file +}; diff --git a/docs/examples/components/TooltipSlider.tsx b/docs/examples/components/TooltipSlider.tsx index 9a3240455..bb8d00b72 100644 --- a/docs/examples/components/TooltipSlider.tsx +++ b/docs/examples/components/TooltipSlider.tsx @@ -1,9 +1,7 @@ -import type { SliderProps } from '@rc-component/slider'; -import Slider from '@rc-component/slider'; -import type { TooltipRef } from '@rc-component/tooltip'; -import Tooltip from '@rc-component/tooltip'; +import Slider, { type SliderProps } from '@rc-component/slider'; +import Tooltip, { type TooltipRef } from '@rc-component/tooltip'; import '@rc-component/tooltip/assets/bootstrap.css'; -import raf from '@rc-component/util/lib/raf'; +import { raf } from '@rc-component/util'; import * as React from 'react'; interface HandleTooltipProps { diff --git a/package.json b/package.json index c7f384480..a806c03ff 100644 --- a/package.json +++ b/package.json @@ -42,20 +42,22 @@ "tsc": "bunx tsc --noEmit" }, "dependencies": { - "@rc-component/util": "^1.3.0", + "@rc-component/util": "^1.11.1", "clsx": "^2.1.1" }, "devDependencies": { - "@rc-component/father-plugin": "^2.1.3", + "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.0", "@rc-component/tooltip": "^1.2.1", "@rc-component/trigger": "^3.5.2", "@testing-library/jest-dom": "^6.1.5", - "@testing-library/react": "^12.1.3", + "@testing-library/react": "^16.0.0", "@types/jest": "^29.5.1", "@types/node": "^22.5.0", "@types/react": "^18.2.42", "@types/react-dom": "^18.0.11", + "@typescript-eslint/eslint-plugin": "^5.62.0", + "@typescript-eslint/parser": "^5.62.0", "@umijs/fabric": "^4.0.1", "cross-env": "^7.0.0", "dumi": "^2.2.10", @@ -68,8 +70,8 @@ "glob": "^7.1.6", "less": "^4.1.3", "rc-test": "^7.0.15", - "react": "^16.0.0", - "react-dom": "^16.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "regenerator-runtime": "^0.14.0", "typescript": "^5.1.6" }, diff --git a/src/Handles/Handle.tsx b/src/Handles/Handle.tsx index ae902f4b6..f6951a509 100644 --- a/src/Handles/Handle.tsx +++ b/src/Handles/Handle.tsx @@ -1,5 +1,5 @@ import { clsx } from 'clsx'; -import KeyCode from '@rc-component/util/lib/KeyCode'; +import { KeyCode } from '@rc-component/util'; import * as React from 'react'; import SliderContext from '../context'; import type { OnStartMove } from '../interface'; diff --git a/src/Handles/index.tsx b/src/Handles/index.tsx index 52f418f34..6174f6fea 100644 --- a/src/Handles/index.tsx +++ b/src/Handles/index.tsx @@ -2,8 +2,7 @@ import * as React from 'react'; import { flushSync } from 'react-dom'; import type { OnStartMove } from '../interface'; import { getIndex } from '../util'; -import type { HandleProps } from './Handle'; -import Handle from './Handle'; +import Handle, { type HandleProps } from './Handle'; export interface HandlesProps { prefixCls: string; diff --git a/src/Slider.tsx b/src/Slider.tsx index 2734924e8..a5f550a57 100644 --- a/src/Slider.tsx +++ b/src/Slider.tsx @@ -1,17 +1,11 @@ -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 { isEqual, useControlledState, useEvent, warning } from '@rc-component/util'; import { clsx } from 'clsx'; import * as React from 'react'; -import type { HandlesProps, HandlesRef } from './Handles'; -import Handles from './Handles'; -import type { InternalMarkObj, MarkObj } from './Marks'; -import Marks from './Marks'; +import Handles, { type HandlesProps, type HandlesRef } from './Handles'; +import Marks, { type InternalMarkObj, type MarkObj } from './Marks'; import Steps from './Steps'; import Tracks from './Tracks'; -import type { SliderContextProps } from './context'; -import SliderContext from './context'; +import SliderContext, { type SliderContextProps } from './context'; import useDisabled from './hooks/useDisabled'; import useDrag from './hooks/useDrag'; import useOffset, { getClosestEnabledHandleIndex } from './hooks/useOffset'; diff --git a/src/hooks/useDrag.ts b/src/hooks/useDrag.ts index 99455d735..a497e3972 100644 --- a/src/hooks/useDrag.ts +++ b/src/hooks/useDrag.ts @@ -1,6 +1,5 @@ import * as React from 'react'; -import useEvent from '@rc-component/util/lib/hooks/useEvent'; -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; +import { useEvent, useLayoutEffect } from '@rc-component/util'; import { UnstableContext } from '../context'; import type { Direction, OnStartMove } from '../interface'; import type { OffsetValues } from './useOffset'; diff --git a/src/hooks/useRange.ts b/src/hooks/useRange.ts index 4867b77ca..320939b2a 100644 --- a/src/hooks/useRange.ts +++ b/src/hooks/useRange.ts @@ -1,4 +1,4 @@ -import { warning } from '@rc-component/util/lib/warning'; +import { warning } from '@rc-component/util'; import { useMemo } from 'react'; import type { SliderProps } from '../Slider'; diff --git a/src/index.tsx b/src/index.tsx index 70dc6bb9a..4d7a41ca4 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,5 +1,4 @@ -import type { SliderProps, SliderRef } from './Slider'; -import Slider from './Slider'; +import Slider, { type SliderProps, type SliderRef } from './Slider'; export { UnstableContext } from './context'; export type { SliderProps, SliderRef }; diff --git a/tests/Range.test.tsx b/tests/Range.test.tsx index 1f655af90..dbcbe1a2a 100644 --- a/tests/Range.test.tsx +++ b/tests/Range.test.tsx @@ -1,9 +1,7 @@ /* 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-component/util/lib/KeyCode'; -import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; -import { resetWarned } from '@rc-component/util/lib/warning'; +import { KeyCode as keyCode, resetWarned, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; diff --git a/tests/Slider.test.js b/tests/Slider.test.js index 290a30768..2300fe046 100644 --- a/tests/Slider.test.js +++ b/tests/Slider.test.js @@ -1,8 +1,7 @@ import '@testing-library/jest-dom'; import { createEvent, fireEvent, render } from '@testing-library/react'; import { clsx } from 'clsx'; -import keyCode from '@rc-component/util/lib/KeyCode'; -import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; +import { KeyCode as keyCode, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src/Slider'; diff --git a/tests/common.test.js b/tests/common.test.js index 0a85352b7..83ceb0d9c 100644 --- a/tests/common.test.js +++ b/tests/common.test.js @@ -1,8 +1,7 @@ /* eslint-disable max-len, no-undef */ import '@testing-library/jest-dom'; import { createEvent, fireEvent, render } from '@testing-library/react'; -import KeyCode from '@rc-component/util/lib/KeyCode'; -import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; +import { KeyCode, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; diff --git a/tests/marks.test.js b/tests/marks.test.js index 8a48e2a48..c5ffd4907 100644 --- a/tests/marks.test.js +++ b/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-component/util/lib/test/domHook'; +import { spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src';