Skip to content

Commit c4fe35f

Browse files
authored
Merge pull request #42 from mjoyce91/tail-content
Add ability to pass content to tail
2 parents 24f60dc + e093b47 commit c4fe35f

File tree

3 files changed

+155
-2
lines changed

3 files changed

+155
-2
lines changed

src/Step.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export default class Step extends React.Component {
3030
PropTypes.bool,
3131
PropTypes.func,
3232
]),
33+
tailContent: PropTypes.any,
3334
};
3435
renderIconNode() {
3536
const {
@@ -68,7 +69,8 @@ export default class Step extends React.Component {
6869
className, prefixCls, style, itemWidth,
6970
status = 'wait', iconPrefix, icon, wrapperStyle,
7071
adjustMarginRight, stepNumber,
71-
description, title, progressDot, ...restProps,
72+
description, title, progressDot, tailContent,
73+
...restProps,
7274
} = this.props;
7375

7476
const classString = classNames(
@@ -90,7 +92,9 @@ export default class Step extends React.Component {
9092
className={classString}
9193
style={stepItemStyle}
9294
>
93-
<div className={`${prefixCls}-item-tail`} />
95+
<div className={`${prefixCls}-item-tail`}>
96+
{tailContent}
97+
</div>
9498
<div className={`${prefixCls}-item-icon`}>
9599
{this.renderIconNode()}
96100
</div>

tests/__snapshots__/index.test.js.snap

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,143 @@ exports[`Steps render renders step with description and status 1`] = `
984984
</div>
985985
`;
986986

987+
exports[`Steps render renders step with tailContent 1`] = `
988+
<div
989+
class="rc-steps rc-steps-horizontal rc-steps-label-horizontal"
990+
>
991+
<div
992+
class="rc-steps-item rc-steps-item-process"
993+
>
994+
<div
995+
class="rc-steps-item-tail"
996+
>
997+
text
998+
</div>
999+
<div
1000+
class="rc-steps-item-icon"
1001+
>
1002+
<span
1003+
class="rc-steps-icon"
1004+
>
1005+
1
1006+
</span>
1007+
</div>
1008+
<div
1009+
class="rc-steps-item-content"
1010+
>
1011+
<div
1012+
class="rc-steps-item-title"
1013+
>
1014+
已完成
1015+
</div>
1016+
<div
1017+
class="rc-steps-item-description"
1018+
>
1019+
xx
1020+
</div>
1021+
</div>
1022+
</div>
1023+
<div
1024+
class="rc-steps-item rc-steps-item-wait"
1025+
>
1026+
<div
1027+
class="rc-steps-item-tail"
1028+
>
1029+
<div>
1030+
content
1031+
</div>
1032+
</div>
1033+
<div
1034+
class="rc-steps-item-icon"
1035+
>
1036+
<span
1037+
class="rc-steps-icon"
1038+
>
1039+
2
1040+
</span>
1041+
</div>
1042+
<div
1043+
class="rc-steps-item-content"
1044+
>
1045+
<div
1046+
class="rc-steps-item-title"
1047+
>
1048+
进行中
1049+
</div>
1050+
<div
1051+
class="rc-steps-item-description"
1052+
>
1053+
xx
1054+
</div>
1055+
</div>
1056+
</div>
1057+
<div
1058+
class="rc-steps-item rc-steps-item-wait"
1059+
>
1060+
<div
1061+
class="rc-steps-item-tail"
1062+
>
1063+
3
1064+
</div>
1065+
<div
1066+
class="rc-steps-item-icon"
1067+
>
1068+
<span
1069+
class="rc-steps-icon"
1070+
>
1071+
3
1072+
</span>
1073+
</div>
1074+
<div
1075+
class="rc-steps-item-content"
1076+
>
1077+
<div
1078+
class="rc-steps-item-title"
1079+
>
1080+
待运行
1081+
</div>
1082+
<div
1083+
class="rc-steps-item-description"
1084+
>
1085+
xx
1086+
</div>
1087+
</div>
1088+
</div>
1089+
<div
1090+
class="rc-steps-item rc-steps-item-wait"
1091+
>
1092+
<div
1093+
class="rc-steps-item-tail"
1094+
>
1095+
text
1096+
</div>
1097+
<div
1098+
class="rc-steps-item-icon"
1099+
>
1100+
<span
1101+
class="rc-steps-icon"
1102+
>
1103+
4
1104+
</span>
1105+
</div>
1106+
<div
1107+
class="rc-steps-item-content"
1108+
>
1109+
<div
1110+
class="rc-steps-item-title"
1111+
>
1112+
待运行
1113+
</div>
1114+
<div
1115+
class="rc-steps-item-description"
1116+
>
1117+
xx
1118+
</div>
1119+
</div>
1120+
</div>
1121+
</div>
1122+
`;
1123+
9871124
exports[`Steps render renders vertical correctly 1`] = `
9881125
<div
9891126
class="rc-steps rc-steps-vertical"

tests/index.test.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,17 @@ describe('Steps', () => {
8686
);
8787
expect(wrapper).toMatchSnapshot();
8888
});
89+
90+
it('renders step with tailContent', () => {
91+
const wrapper = render(
92+
<Steps>
93+
<Step title="已完成" description="xx" tailContent="text" />
94+
<Step title="进行中" description="xx" tailContent={<div>content</div>} />
95+
<Step title="待运行" description="xx" tailContent={3} />
96+
<Step title="待运行" description="xx" tailContent="text" />
97+
</Steps>
98+
);
99+
expect(wrapper).toMatchSnapshot();
100+
});
89101
});
90102
});

0 commit comments

Comments
 (0)