Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@rc-component/trigger": "^3.6.15",
"@rc-component/util": "^1.3.0",
"classnames": "^2.3.1"
"clsx": "^2.1.1"
},
"devDependencies": {
"@rc-component/father-plugin": "^2.0.1",
Expand All @@ -61,11 +61,11 @@
"father": "^4.0.0",
"gh-pages": "^3.1.0",
"less": "^4.1.1",
"prettier": "^3.6.2",
"rc-test": "^7.0.9",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"typescript": "^4.0.5",
"prettier": "^3.6.2"
"typescript": "^4.0.5"
},
"peerDependencies": {
"react": ">=18.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/Popup.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cls from 'classnames';
import { clsx } from 'clsx';
import * as React from 'react';
import type { TooltipProps } from './Tooltip';

Expand All @@ -18,7 +18,7 @@ const Popup: React.FC<ContentProps> = (props) => {
return (
<div
id={id}
className={cls(`${prefixCls}-container`, classNames?.container, className)}
className={clsx(`${prefixCls}-container`, classNames?.container, className)}
style={{ ...styles?.container, ...style }}
role="tooltip"
>
Expand Down
4 changes: 2 additions & 2 deletions src/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ArrowType, TriggerProps, TriggerRef } from '@rc-component/trigger'
import Trigger from '@rc-component/trigger';
import type { ActionType, AlignType } from '@rc-component/trigger/lib/interface';
import useId from '@rc-component/util/lib/hooks/useId';
import cls from 'classnames';
import { clsx } from 'clsx';
import * as React from 'react';
import { useImperativeHandle, useRef } from 'react';
import { placements } from './placements';
Expand Down Expand Up @@ -106,7 +106,7 @@ const Tooltip = React.forwardRef<TooltipRef, TooltipProps>((props, ref) => {
// Apply semantic styles with unified logic
return {
...arrowConfig,
className: cls(arrowConfig.className, classNames?.arrow),
className: clsx(arrowConfig.className, classNames?.arrow),
style: { ...arrowConfig.style, ...styles?.arrow },
content: arrowConfig.content ?? arrowContent,
};
Expand Down