Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ es
coverage
yarn.lock
package-lock.json
pnpm-lock.yaml
bun.lockb
.vscode

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@
"@rc-component/portal": "^2.0.0",
"@rc-component/resize-observer": "^1.0.0",
"@rc-component/util": "^1.2.1",
"classnames": "^2.3.2"
"clsx": "^2.1.1"
},
"devDependencies": {
"@rc-component/father-plugin": "^2.0.0",
"@rc-component/np": "^1.0.3",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^16.0.0",
"@types/classnames": "^2.2.10",
"@types/jest": "^29.5.2",
"@types/node": "^24.0.3",
"@types/react": "^19.1.2",
Expand Down
4 changes: 2 additions & 2 deletions src/Popup/Arrow.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import classNames from 'classnames';
import { clsx } from 'clsx';
import * as React from 'react';
import type { AlignType, ArrowPos, ArrowTypeOuter } from '../interface';

Expand Down Expand Up @@ -57,7 +57,7 @@ export default function Arrow(props: ArrowProps) {
return (
<div
ref={arrowRef}
className={classNames(`${prefixCls}-arrow`, className)}
className={clsx(`${prefixCls}-arrow`, className)}
style={{ ...alignStyle, ...style }}
>
{content}
Expand Down
4 changes: 2 additions & 2 deletions src/Popup/Mask.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import classNames from 'classnames';
import { clsx } from 'clsx';
import type { CSSMotionProps } from '@rc-component/motion';
import CSSMotion from '@rc-component/motion';
import * as React from 'react';
Expand Down Expand Up @@ -36,7 +36,7 @@ export default function Mask(props: MaskProps) {
{({ className }) => (
<div
style={{ zIndex }}
className={classNames(
className={clsx(
`${prefixCls}-mask`,
mobile && `${prefixCls}-mobile-mask`,
className,
Expand Down
4 changes: 2 additions & 2 deletions src/Popup/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import classNames from 'classnames';
import { clsx } from 'clsx';
import type { CSSMotionProps } from '@rc-component/motion';
import CSSMotion from '@rc-component/motion';
import ResizeObserver, {
Expand Down Expand Up @@ -266,7 +266,7 @@ const Popup = React.forwardRef<HTMLDivElement, PopupProps>((props, ref) => {
{ className: motionClassName, style: motionStyle },
motionRef,
) => {
const cls = classNames(prefixCls, motionClassName, className, {
const cls = clsx(prefixCls, motionClassName, className, {
[`${prefixCls}-mobile`]: isMobile,
});

Expand Down
9 changes: 3 additions & 6 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Portal from '@rc-component/portal';
import classNames from 'classnames';
import { clsx } from 'clsx';
import type { CSSMotionProps } from '@rc-component/motion';
import ResizeObserver from '@rc-component/resize-observer';
import { isDOM } from '@rc-component/util/lib/Dom/findDOMNode';
Expand Down Expand Up @@ -511,7 +511,7 @@ export function generateTrigger(
alignPoint,
);

return classNames(baseClassName, getPopupClassNameFromAlign?.(alignInfo));
return clsx(baseClassName, getPopupClassNameFromAlign?.(alignInfo));
}, [
alignInfo,
getPopupClassNameFromAlign,
Expand Down Expand Up @@ -804,10 +804,7 @@ export function generateTrigger(
ref={setPopupRef}
prefixCls={prefixCls}
popup={popup}
className={classNames(
popupClassName,
!isMobile && alignedClassName,
)}
className={clsx(popupClassName, !isMobile && alignedClassName)}
style={popupStyle}
target={targetEle}
onMouseEnter={onPopupMouseEnter}
Expand Down
Loading