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
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
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@rc-component/trigger",
"version": "3.5.2",
"description": "base abstract trigger component for react",
"name": "@rc-component/listy",
"version": "1.0.0",
"description": "base abstract listy component for react",
"engines": {
"node": ">=8.x"
},
Expand Down Expand Up @@ -44,15 +44,14 @@
"@rc-component/motion": "^1.1.4",
"@rc-component/portal": "^2.0.0",
"@rc-component/resize-observer": "^1.0.0",
"@rc-component/util": "^1.2.1",
"classnames": "^2.3.2"
"@rc-component/util": "^1.3.0",
"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": "^30.0.0",
"@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}
>
{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 from '@rc-component/resize-observer';
Expand Down Expand Up @@ -270,7 +270,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
10 changes: 4 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 @@ -198,6 +198,7 @@ export function generateTrigger(
const subPopupElements = React.useRef<Record<string, HTMLElement>>({});

const parentContext = React.useContext(TriggerContext);

const context = React.useMemo<TriggerContextProps>(() => {
return {
registerSubPopup: (id, subPopupEle) => {
Expand Down Expand Up @@ -427,7 +428,7 @@ export function generateTrigger(
alignPoint,
);

return classNames(baseClassName, getPopupClassNameFromAlign?.(alignInfo));
return clsx(baseClassName, getPopupClassNameFromAlign?.(alignInfo));
}, [
alignInfo,
getPopupClassNameFromAlign,
Expand Down Expand Up @@ -727,10 +728,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