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 @@ lib
es
coverage
package-lock.json
pnpm-lock.yaml
yarn.lock
.doc
.umi
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
]
},
"dependencies": {
"classnames": "^2.2.3",
"@rc-component/util": "^1.2.1"
"@rc-component/util": "^1.2.1",
"clsx": "^2.1.1"
},
"devDependencies": {
"@rc-component/father-plugin": "^2.0.2",
"@rc-component/np": "^1.0.0",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.6",
"@types/classnames": "^2.2.9",
"@types/jest": "^29.4.0",
"@types/node": "^24.5.2",
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@umijs/fabric": "^4.0.1",
Expand Down
4 changes: 2 additions & 2 deletions src/Rail.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import cls from 'classnames';
import { clsx } from 'clsx';
import type { Status } from './Steps';

export interface RailProps {
Expand All @@ -14,5 +14,5 @@ export default function Rail(props: RailProps) {
const railCls = `${prefixCls}-rail`;

// ============================= render =============================
return <div className={cls(railCls, `${railCls}-${status}`, className)} style={style} />;
return <div className={clsx(railCls, `${railCls}-${status}`, className)} style={style} />;
}
48 changes: 15 additions & 33 deletions src/Step.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint react/prop-types: 0 */
import * as React from 'react';
import cls from 'classnames';
import { clsx } from 'clsx';
import KeyCode from '@rc-component/util/lib/KeyCode';
import type { Status, StepItem, StepsProps } from './Steps';
import Rail from './Rail';
Expand Down Expand Up @@ -126,7 +126,7 @@ export default function Step(props: StepProps) {
const hasTitle = hasContent(title);
const hasSubTitle = hasContent(subTitle);

const classString = cls(
const classString = clsx(
itemCls,
`${itemCls}-${mergedStatus}`,
{
Expand All @@ -152,11 +152,8 @@ export default function Step(props: StepProps) {

const wrapperNode = (
<div
className={cls(`${itemCls}-wrapper`, classNames.itemWrapper, itemClassNames.wrapper)}
style={{
...styles.itemWrapper,
...itemStyles.wrapper,
}}
className={clsx(`${itemCls}-wrapper`, classNames.itemWrapper, itemClassNames.wrapper)}
style={{ ...styles.itemWrapper, ...itemStyles.wrapper }}
>
{/* Icon */}
<StepIconSemanticContext.Provider
Expand All @@ -169,42 +166,30 @@ export default function Step(props: StepProps) {
</StepIconSemanticContext.Provider>

<div
className={cls(`${itemCls}-section`, classNames.itemSection, itemClassNames.section)}
style={{
...styles.itemSection,
...itemStyles.section,
}}
className={clsx(`${itemCls}-section`, classNames.itemSection, itemClassNames.section)}
style={{ ...styles.itemSection, ...itemStyles.section }}
>
<div
className={cls(`${itemCls}-header`, classNames.itemHeader, itemClassNames.header)}
style={{
...styles.itemHeader,
...itemStyles.header,
}}
className={clsx(`${itemCls}-header`, classNames.itemHeader, itemClassNames.header)}
style={{ ...styles.itemHeader, ...itemStyles.header }}
>
{hasTitle && (
<div
className={cls(`${itemCls}-title`, classNames.itemTitle, itemClassNames.title)}
style={{
...styles.itemTitle,
...itemStyles.title,
}}
className={clsx(`${itemCls}-title`, classNames.itemTitle, itemClassNames.title)}
style={{ ...styles.itemTitle, ...itemStyles.title }}
>
{title}
</div>
)}
{hasSubTitle && (
<div
title={typeof subTitle === 'string' ? subTitle : undefined}
className={cls(
className={clsx(
`${itemCls}-subtitle`,
classNames.itemSubtitle,
itemClassNames.subtitle,
)}
style={{
...styles.itemSubtitle,
...itemStyles.subtitle,
}}
style={{ ...styles.itemSubtitle, ...itemStyles.subtitle }}
>
{subTitle}
</div>
Expand All @@ -213,18 +198,15 @@ export default function Step(props: StepProps) {
{!last && (
<Rail
prefixCls={itemCls}
className={cls(classNames.itemRail, itemClassNames.rail)}
style={{
...styles.itemRail,
...itemStyles.rail,
}}
className={clsx(classNames.itemRail, itemClassNames.rail)}
style={{ ...styles.itemRail, ...itemStyles.rail }}
status={railFollowPrevStatus ? status : nextStatus}
/>
)}
</div>
{hasContent(mergedContent) && (
<div
className={cls(`${itemCls}-content`, classNames.itemContent, itemClassNames.content)}
className={clsx(`${itemCls}-content`, classNames.itemContent, itemClassNames.content)}
style={{ ...styles.itemContent, ...itemStyles.content }}
>
{mergedContent}
Expand Down
10 changes: 3 additions & 7 deletions src/StepIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import cls from 'classnames';
import { clsx } from 'clsx';
import { StepsContext } from './Context';
import pickAttrs from '@rc-component/util/lib/pickAttrs';

Expand All @@ -24,12 +24,8 @@ const StepIcon = React.forwardRef<HTMLDivElement, StepIconProps>((props, ref) =>
<div
{...pickAttrs(restProps, false)}
ref={ref}
className={cls(`${itemCls}-icon`, classNames.itemIcon, itemClassName, className)}
style={{
...styles.itemIcon,
...itemStyle,
...style,
}}
className={clsx(`${itemCls}-icon`, classNames.itemIcon, itemClassName, className)}
style={{ ...styles.itemIcon, ...itemStyle, ...style }}
>
{children}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/Steps.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint react/no-did-mount-set-state: 0, react/prop-types: 0 */
import cls from 'classnames';
import { clsx } from 'clsx';
import React from 'react';
import Step from './Step';
import { StepsContext, type StepsContextProps } from './Context';
Expand Down Expand Up @@ -140,7 +140,7 @@ export default function Steps(props: StepsProps) {
!isVertical && titlePlacement === 'vertical' ? 'vertical' : 'horizontal';

// ============================= styles =============================
const classString = cls(
const classString = clsx(
prefixCls,
`${prefixCls}-${mergedOrientation}`,
`${prefixCls}-title-${mergeTitlePlacement}`,
Expand Down