Skip to content

perf: uninstall classnames, install clsx #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
li-jia-nan merged 1 commit into from
Sep 28, 2025
+20 −24
Merged

perf: uninstall classnames, install clsx #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@
"tsc": "bunx tsc --noEmit"
},
"dependencies": {
"@rc-component/portal": "^2.0.0",
"@rc-component/motion": "^1.0.0",
"@rc-component/portal": "^2.0.0",
"@rc-component/util": "^1.3.0",
"classnames": "^2.2.6"
"clsx": "^2.1.1"
},
"devDependencies": {
"@ant-design/icons": "^5.0.1",
"@rc-component/father-plugin": "^2.0.2",
"@rc-component/np": "^1.0.0",
"@testing-library/jest-dom": "^6.4.0",
"@testing-library/react": "^15.0.6",
"@types/classnames": "^2.2.10",
"@types/jest": "^29.5.11",
"@types/node": "^24.5.2",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@umijs/fabric": "^4.0.1",
Expand Down
10 changes: 5 additions & 5 deletions src/Image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import useControlledState from '@rc-component/util/lib/hooks/useControlledState';
import classnames from 'classnames';
import { clsx } from 'clsx';
import * as React from 'react';
import { useContext, useMemo, useState } from 'react';
import type { InternalPreviewConfig, PreviewSemanticName, ToolbarRenderInfoType } from './Preview';
Expand Down Expand Up @@ -208,7 +208,7 @@ const ImageInternal: CompoundedComponent<ImageProps> = props => {
<>
<div
{...otherProps}
className={classnames(prefixCls, rootClassName, classNames.root, {
className={clsx(prefixCls, rootClassName, classNames.root, {
[`${prefixCls}-error`]: status === 'error',
})}
onClick={canPreview ? onPreview : onClick}
Expand All @@ -220,7 +220,7 @@ const ImageInternal: CompoundedComponent<ImageProps> = props => {
>
<img
{...imgCommonProps}
className={classnames(
className={clsx(
`${prefixCls}-img`,
{
[`${prefixCls}-img-placeholder`]: placeholder === true,
Expand Down Expand Up @@ -249,7 +249,7 @@ const ImageInternal: CompoundedComponent<ImageProps> = props => {
{/* Preview Click Mask */}
{cover !== false && canPreview && (
<div
className={classnames(
className={clsx(
`${prefixCls}-cover`,
classNames.cover,
`${prefixCls}-cover-${coverPlacement}`,
Expand Down Expand Up @@ -278,7 +278,7 @@ const ImageInternal: CompoundedComponent<ImageProps> = props => {
{...restProps}
classNames={classNames?.popup}
styles={styles?.popup}
rootClassName={classnames(previewRootClassName, rootClassName)}
rootClassName={clsx(previewRootClassName, rootClassName)}
/>
)}
</>
Expand Down
8 changes: 4 additions & 4 deletions src/Preview/Footer.tsx
View file
Open in desktop
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 { Actions, PreviewProps } from '.';
import type { ImgInfo } from '../Image';
Expand Down Expand Up @@ -97,7 +97,7 @@ export default function Footer(props: FooterProps) {
return (
<div
key={type}
className={classnames(actionCls, `${actionCls}-${type}`, {
className={clsx(actionCls, `${actionCls}-${type}`, {
[`${actionCls}-disabled`]: !!disabled,
})}
onClick={onClick}
Expand Down Expand Up @@ -164,7 +164,7 @@ export default function Footer(props: FooterProps) {
});

const actionsNode = (
<div className={classnames(`${prefixCls}-actions`, classNames.actions)} style={styles.actions}>
<div className={clsx(`${prefixCls}-actions`, classNames.actions)} style={styles.actions}>
{flipYNode}
{flipXNode}
{rotateLeftNode}
Expand All @@ -176,7 +176,7 @@ export default function Footer(props: FooterProps) {

// >>>>> Render
return (
<div className={classnames(`${prefixCls}-footer`, classNames.footer)} style={styles.footer}>
<div className={clsx(`${prefixCls}-footer`, classNames.footer)} style={styles.footer}>
{progressNode}
{actionsRender
? actionsRender(actionsNode, {
Expand Down
6 changes: 3 additions & 3 deletions src/Preview/PrevNext.tsx
View file
Open in desktop
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 { OperationIcons } from '.';

Expand All @@ -24,15 +24,15 @@ export default function PrevNext(props: PrevNextProps) {
return (
<>
<div
className={classNames(switchCls, `${switchCls}-prev`, {
className={clsx(switchCls, `${switchCls}-prev`, {
[`${switchCls}-disabled`]: current === 0,
})}
onClick={() => onActive(-1)}
>
{prev ?? left}
</div>
<div
className={classNames(switchCls, `${switchCls}-next`, {
className={clsx(switchCls, `${switchCls}-next`, {
[`${switchCls}-disabled`]: current === count - 1,
})}
onClick={() => onActive(1)}
Expand Down
14 changes: 5 additions & 9 deletions src/Preview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Portal, { type PortalProps } from '@rc-component/portal';
import { useEvent } from '@rc-component/util';
import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
import KeyCode from '@rc-component/util/lib/KeyCode';
import classnames from 'classnames';
import { clsx } from 'clsx';
import React, { useContext, useEffect, useRef, useState } from 'react';
import { PreviewGroupContext } from '../context';
import type { TransformAction, TransformType } from '../hooks/useImageTransform';
Expand Down Expand Up @@ -410,27 +410,23 @@ const Preview: React.FC<PreviewProps> = props => {

return (
<div
className={classnames(prefixCls, rootClassName, classNames.root, motionClassName, {
className={clsx(prefixCls, rootClassName, classNames.root, motionClassName, {
[`${prefixCls}-moving`]: isMoving,
})}
style={mergedStyle}
>
{/* Mask */}
<div
className={classnames(`${prefixCls}-mask`, classNames.mask)}
className={clsx(`${prefixCls}-mask`, classNames.mask)}
style={styles.mask}
onClick={onClose}
/>

{/* Body */}
<div className={classnames(`${prefixCls}-body`, classNames.body)} style={bodyStyle}>
<div className={clsx(`${prefixCls}-body`, classNames.body)} style={bodyStyle}>
{/* Preview Image */}
{imageRender
? imageRender(imgNode, {
transform,
image,
...(groupContext ? { current } : {}),
})
? imageRender(imgNode, { transform, image, ...(groupContext ? { current } : {}) })
: imgNode}
</div>

Expand Down