diff --git a/.dumirc.ts b/.dumirc.ts index 0c6969ca9..105d4b032 100644 --- a/.dumirc.ts +++ b/.dumirc.ts @@ -3,8 +3,8 @@ import path from 'path'; export default defineConfig({ alias: { - 'rc-slider$': path.resolve('src'), - 'rc-slider/es': path.resolve('src'), + '@rc-component/slider$': path.resolve('src'), + '@rc-component/slider/es': path.resolve('src'), }, mfsu: false, favicons: ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'], diff --git a/README.md b/README.md index a59a07b50..76577985f 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Online examples: https://slider.react-component.now.sh/ ## Slider ```js -import Slider from 'rc-slider'; -import 'rc-slider/assets/index.css'; +import Slider from '@rc-component/slider'; +import '@rc-component/slider/assets/index.css'; export default () => ( <> @@ -55,8 +55,8 @@ export default () => ( Please refer to [#825](https://github.com/react-component/slider/issues/825) for information regarding usage of `Range`. An example: ```js -import Slider, { Range } from 'rc-slider'; -import 'rc-slider/assets/index.css'; +import Slider, { Range } from '@rc-component/slider'; +import '@rc-component/slider/assets/index.css'; export default () => ( <> @@ -78,7 +78,7 @@ export default () => ( An extension to make Slider or Range support Tooltip on handle. ```js -const Slider = require('rc-slider'); +const Slider = require('@rc-component/slider'); const createSliderWithTooltip = Slider.createSliderWithTooltip; const Range = createSliderWithTooltip(Slider.Range); ``` diff --git a/docs/examples/components/TooltipSlider.tsx b/docs/examples/components/TooltipSlider.tsx index 79db7ba25..4ce44a8fe 100644 --- a/docs/examples/components/TooltipSlider.tsx +++ b/docs/examples/components/TooltipSlider.tsx @@ -1,9 +1,9 @@ -import type { SliderProps } from 'rc-slider'; -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 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 '@rc-component/tooltip/assets/bootstrap.css'; +import raf from '@rc-component/util/lib/raf'; import * as React from 'react'; interface HandleTooltipProps { diff --git a/docs/examples/debug.tsx b/docs/examples/debug.tsx index 31857d50d..bc534c767 100644 --- a/docs/examples/debug.tsx +++ b/docs/examples/debug.tsx @@ -1,4 +1,4 @@ -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; diff --git a/docs/examples/editable.tsx b/docs/examples/editable.tsx index 54e561b7b..e15f44f9a 100644 --- a/docs/examples/editable.tsx +++ b/docs/examples/editable.tsx @@ -1,5 +1,5 @@ /* eslint react/no-multi-comp: 0, no-console: 0 */ -import Slider, { UnstableContext } from 'rc-slider'; +import Slider, { UnstableContext } from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; import type { UnstableContextProps } from '../../src/context'; diff --git a/docs/examples/handle.tsx b/docs/examples/handle.tsx index fc38d15c0..b78004817 100644 --- a/docs/examples/handle.tsx +++ b/docs/examples/handle.tsx @@ -1,4 +1,4 @@ -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; import TooltipSlider, { handleRender } from './components/TooltipSlider'; diff --git a/docs/examples/marks.tsx b/docs/examples/marks.tsx index 72bba0e20..784ca74cf 100644 --- a/docs/examples/marks.tsx +++ b/docs/examples/marks.tsx @@ -1,4 +1,4 @@ -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; diff --git a/docs/examples/multiple.tsx b/docs/examples/multiple.tsx index 73fd94ada..461df913d 100644 --- a/docs/examples/multiple.tsx +++ b/docs/examples/multiple.tsx @@ -1,5 +1,5 @@ /* eslint react/no-multi-comp: 0, no-console: 0 */ -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; diff --git a/docs/examples/range.tsx b/docs/examples/range.tsx index 262a72c9a..c0d6337f1 100644 --- a/docs/examples/range.tsx +++ b/docs/examples/range.tsx @@ -1,5 +1,5 @@ /* eslint react/no-multi-comp: 0, no-console: 0 */ -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; diff --git a/docs/examples/slider.tsx b/docs/examples/slider.tsx index 31fc9e8ce..2de9ce50c 100644 --- a/docs/examples/slider.tsx +++ b/docs/examples/slider.tsx @@ -1,5 +1,5 @@ /* eslint react/no-multi-comp: 0, max-len: 0 */ -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; import TooltipSlider from './components/TooltipSlider'; diff --git a/docs/examples/vertical.tsx b/docs/examples/vertical.tsx index a934d9870..2e74afa2f 100644 --- a/docs/examples/vertical.tsx +++ b/docs/examples/vertical.tsx @@ -1,4 +1,4 @@ -import Slider from 'rc-slider'; +import Slider from '@rc-component/slider'; import React from 'react'; import '../../assets/index.less'; diff --git a/package.json b/package.json index fe54ccdc0..b80ff4d3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "rc-slider", - "version": "11.1.8", + "name": "@rc-component/slider", + "version": "1.0.0", "description": "Slider UI component for React", "keywords": [ "react", @@ -10,7 +10,7 @@ "input", "range" ], - "homepage": "http://github.com/react-component/slider/", + "homepage": "https://react-component.github.io/slider", "bugs": { "url": "http://github.com/react-component/slider/issues" }, @@ -35,18 +35,21 @@ "docs:deploy": "gh-pages -d .doc", "lint": "eslint src/ --ext .ts,.tsx,.jsx,.js,.md", "now-build": "npm run docs:build", - "prepublishOnly": "npm run compile && np --yolo --no-publish", + "prepublishOnly": "npm run compile && rc-np", "prettier": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\"", "start": "dumi dev", - "test": "rc-test" + "test": "rc-test", + "tsc": "bunx tsc --noEmit" }, "dependencies": { - "@babel/runtime": "^7.10.1", - "classnames": "^2.2.5", - "rc-util": "^5.36.0" + "@rc-component/util": "^1.3.0", + "classnames": "^2.2.5" }, "devDependencies": { - "@rc-component/father-plugin": "^1.0.2", + "@rc-component/father-plugin": "^2.1.3", + "@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", "@types/classnames": "^2.2.9", @@ -65,10 +68,7 @@ "gh-pages": "^6.1.0", "glob": "^7.1.6", "less": "^4.1.3", - "np": "^10.0.4", "rc-test": "^7.0.15", - "rc-tooltip": "^6.1.2", - "rc-trigger": "^5.3.4", "react": "^16.0.0", "react-dom": "^16.0.0", "regenerator-runtime": "^0.14.0", diff --git a/src/Handles/Handle.tsx b/src/Handles/Handle.tsx index 5c4e8ec4e..c7afa3986 100644 --- a/src/Handles/Handle.tsx +++ b/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'; diff --git a/src/Slider.tsx b/src/Slider.tsx index c8d61c65f..6759f6716 100644 --- a/src/Slider.tsx +++ b/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>((prop ); // ============================ Values ============================ - const [mergedValue, setValue] = useMergedState(defaultValue, { - value, - }); + const [mergedValue, setValue] = useControlledState(defaultValue, value); const rawValues = React.useMemo(() => { const valueList = diff --git a/src/hooks/useDrag.ts b/src/hooks/useDrag.ts index 9d3f22e6a..46c4fac06 100644 --- a/src/hooks/useDrag.ts +++ b/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'; diff --git a/src/hooks/useRange.ts b/src/hooks/useRange.ts index 4605a1b60..f1478bfb6 100644 --- a/src/hooks/useRange.ts +++ b/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'; diff --git a/tests/Range.test.tsx b/tests/Range.test.tsx index e1cc13d2c..3bf6e8973 100644 --- a/tests/Range.test.tsx +++ b/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'; diff --git a/tests/Slider.test.js b/tests/Slider.test.js index 095080832..4c74bdda4 100644 --- a/tests/Slider.test.js +++ b/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'; diff --git a/tests/__mocks__/rc-trigger.js b/tests/__mocks__/rc-trigger.js index 323030759..887c966db 100644 --- a/tests/__mocks__/rc-trigger.js +++ b/tests/__mocks__/rc-trigger.js @@ -1,3 +1,3 @@ -import Trigger from 'rc-trigger/lib/mock'; +import Trigger from '@rc-component/trigger/lib/mock'; export default Trigger; diff --git a/tests/common.test.js b/tests/common.test.js index 23d417af4..0a85352b7 100644 --- a/tests/common.test.js +++ b/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'; diff --git a/tests/marks.test.js b/tests/marks.test.js index 56e342654..8a48e2a48 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-util/lib/test/domHook'; +import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import Slider from '../src'; diff --git a/tsconfig.json b/tsconfig.json index 7d388903b..0e921d816 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "paths": { "@/*": ["src/*"], "@@/*": ["src/.umi/*"], - "rc-slider": ["src/index.tsx"] + "@rc-component/slider": ["src/index.tsx"] } } }