diff --git a/.gitignore b/.gitignore index 5a86750..74665e2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ yarn.lock storybook/ es/ package-lock.json +pnpm-lock.yaml src/*.js src/*.map tslint.json diff --git a/package.json b/package.json index 0f435ae..f2b4fd6 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "dependencies": { "@ant-design/fast-color": "^3.0.0", "@rc-component/util": "^1.3.0", - "classnames": "^2.2.6" + "clsx": "^2.1.1" }, "devDependencies": { "@rc-component/father-plugin": "^2.0.4", @@ -55,7 +55,7 @@ "@rc-component/trigger": "^1.13.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.3.0", - "@types/classnames": "^2.2.6", + "@types/node": "^24.5.2", "@types/react": "^18.0.8", "@types/react-dom": "^18.0.3", "@types/warning": "^3.0.0", diff --git a/src/ColorPicker.tsx b/src/ColorPicker.tsx index a4d87cb..64d52e7 100644 --- a/src/ColorPicker.tsx +++ b/src/ColorPicker.tsx @@ -2,7 +2,7 @@ import type { CSSProperties } from 'react'; import React, { forwardRef, useMemo } from 'react'; import { ColorPickerPrefixCls, defaultColor } from './util'; -import classNames from 'classnames'; +import { clsx } from 'clsx'; import { Color } from './color'; import ColorBlock from './components/ColorBlock'; import Picker from './components/Picker'; @@ -119,7 +119,7 @@ const ColorPicker = forwardRef( }; // ============================ Render ============================ - const mergeCls = classNames(`${prefixCls}-panel`, className, { + const mergeCls = clsx(`${prefixCls}-panel`, className, { [`${prefixCls}-panel-disabled`]: disabled, }); @@ -138,7 +138,7 @@ const ColorPicker = forwardRef( />
diff --git a/src/components/ColorBlock.tsx b/src/components/ColorBlock.tsx index 79af927..7fe7c13 100644 --- a/src/components/ColorBlock.tsx +++ b/src/components/ColorBlock.tsx @@ -1,5 +1,4 @@ -import classNames from 'classnames'; -import type { FC } from 'react'; +import { clsx } from 'clsx'; import React from 'react'; export type ColorBlockProps = { @@ -10,7 +9,7 @@ export type ColorBlockProps = { onClick?: React.MouseEventHandler; }; -const ColorBlock: FC = ({ +const ColorBlock: React.FC = ({ color, prefixCls, className, @@ -20,16 +19,11 @@ const ColorBlock: FC = ({ const colorBlockCls = `${prefixCls}-color-block`; return (
-
+
); }; diff --git a/src/components/Handler.tsx b/src/components/Handler.tsx index faaad8d..f781fcf 100644 --- a/src/components/Handler.tsx +++ b/src/components/Handler.tsx @@ -1,22 +1,19 @@ -import classNames from 'classnames'; -import type { FC } from 'react'; +import { clsx } from 'clsx'; import React from 'react'; type HandlerSize = 'default' | 'small'; -const Handler: FC<{ +const Handler: React.FC<{ size?: HandlerSize; color?: string; prefixCls?: string; }> = ({ size = 'default', color, prefixCls }) => { return (
); }; diff --git a/src/components/Slider.tsx b/src/components/Slider.tsx index 52b102b..3181c7a 100644 --- a/src/components/Slider.tsx +++ b/src/components/Slider.tsx @@ -1,11 +1,10 @@ -import type { FC } from 'react'; import React, { useRef } from 'react'; import useColorDrag from '../hooks/useColorDrag'; import type { HsbaColorType, TransformOffset } from '../interface'; import Palette from './Palette'; import { useEvent } from '@rc-component/util'; -import classNames from 'classnames'; +import { clsx } from 'clsx'; import { Color } from '../color'; import { calcOffset, calculateColor } from '../util'; import Gradient from './Gradient'; @@ -25,7 +24,7 @@ export interface BaseSliderProps { color: Color; } -const Slider: FC = props => { +const Slider: React.FC = props => { const { prefixCls, colors, @@ -36,9 +35,9 @@ const Slider: FC = props => { type, } = props; - const sliderRef = useRef(); - const transformRef = useRef(); - const colorRef = useRef(color); + const sliderRef = useRef(null); + const transformRef = useRef(null); + const colorRef = useRef(color); const getValue = (c: Color) => { return type === 'hue' ? c.getHue() : c.a * 100; @@ -94,10 +93,7 @@ const Slider: FC = props => { return (