diff --git a/.gitignore b/.gitignore index 2cb52c4..b0774d5 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ es coverage yarn.lock package-lock.json +pnpm-lock.yaml .vscode # dumi diff --git a/package.json b/package.json index 421107e..7b92e07 100644 --- a/package.json +++ b/package.json @@ -46,16 +46,17 @@ "dependencies": { "@rc-component/trigger": "^3.0.0", "@rc-component/util": "^1.2.1", - "classnames": "^2.2.6" + "clsx": "^2.1.1" }, "devDependencies": { "@rc-component/father-plugin": "^2.0.2", + "@rc-component/menu": "^1.0.0", "@rc-component/np": "^1.0.3", "@rc-component/resize-observer": "^1.0.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", - "@types/classnames": "^2.2.6", "@types/jest": "^29.0.0", + "@types/node": "^24.5.2", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "@types/warning": "^3.0.0", @@ -71,7 +72,6 @@ "less": "^4.1.1", "lint-staged": "^13.2.1", "prettier": "^2.8.7", - "@rc-component/menu": "^1.0.0", "rc-test": "^7.0.14", "react": "^18.0.0", "react-dom": "^18.0.0", diff --git a/src/Dropdown.tsx b/src/Dropdown.tsx index 55b6871..58bd208 100644 --- a/src/Dropdown.tsx +++ b/src/Dropdown.tsx @@ -7,7 +7,7 @@ import type { BuildInPlacements, } from '@rc-component/trigger/lib/interface'; import { composeRef, getNodeRef, supportRef } from '@rc-component/util/lib/ref'; -import classNames from 'classnames'; +import { clsx } from 'clsx'; import React from 'react'; import useAccessibility from './hooks/useAccessibility'; import Overlay from './Overlay'; @@ -136,7 +136,7 @@ function Dropdown(props: DropdownProps, ref) { }; const childrenNode = React.cloneElement(children, { - className: classNames( + className: clsx( children.props?.className, mergedVisible && getOpenClassName(), ), @@ -156,7 +156,7 @@ function Dropdown(props: DropdownProps, ref) { {...otherProps} prefixCls={prefixCls} ref={triggerRef} - popupClassName={classNames(overlayClassName, { + popupClassName={clsx(overlayClassName, { [`${prefixCls}-show-arrow`]: arrow, })} popupStyle={overlayStyle} diff --git a/tests/__snapshots__/basic.test.tsx.snap b/tests/__snapshots__/basic.test.tsx.snap index ec1fd14..903a5b1 100644 --- a/tests/__snapshots__/basic.test.tsx.snap +++ b/tests/__snapshots__/basic.test.tsx.snap @@ -20,7 +20,7 @@ exports[`dropdown simply works 1`] = ` >