Skip to content

Add ability to pass content to tail #42

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
merged 1 commit into from
Jan 3, 2018
Merged

Add ability to pass content to tail #42

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
8 changes: 6 additions & 2 deletions src/Step.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export default class Step extends React.Component {
PropTypes.bool,
PropTypes.func,
]),
tailContent: PropTypes.any,
};
renderIconNode() {
const {
Expand Down Expand Up @@ -68,7 +69,8 @@ export default class Step extends React.Component {
className, prefixCls, style, itemWidth,
status = 'wait', iconPrefix, icon, wrapperStyle,
adjustMarginRight, stepNumber,
description, title, progressDot, ...restProps,
description, title, progressDot, tailContent,
...restProps,
} = this.props;

const classString = classNames(
Expand All @@ -90,7 +92,9 @@ export default class Step extends React.Component {
className={classString}
style={stepItemStyle}
>
<div className={`${prefixCls}-item-tail`} />
<div className={`${prefixCls}-item-tail`}>
{tailContent}
</div>
<div className={`${prefixCls}-item-icon`}>
{this.renderIconNode()}
</div>
Expand Down
137 changes: 137 additions & 0 deletions tests/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,143 @@ exports[`Steps render renders step with description and status 1`] = `
</div>
`;

exports[`Steps render renders step with tailContent 1`] = `
<div
class="rc-steps rc-steps-horizontal rc-steps-label-horizontal"
>
<div
class="rc-steps-item rc-steps-item-process"
>
<div
class="rc-steps-item-tail"
>
text
</div>
<div
class="rc-steps-item-icon"
>
<span
class="rc-steps-icon"
>
1
</span>
</div>
<div
class="rc-steps-item-content"
>
<div
class="rc-steps-item-title"
>
已完成
</div>
<div
class="rc-steps-item-description"
>
xx
</div>
</div>
</div>
<div
class="rc-steps-item rc-steps-item-wait"
>
<div
class="rc-steps-item-tail"
>
<div>
content
</div>
</div>
<div
class="rc-steps-item-icon"
>
<span
class="rc-steps-icon"
>
2
</span>
</div>
<div
class="rc-steps-item-content"
>
<div
class="rc-steps-item-title"
>
进行中
</div>
<div
class="rc-steps-item-description"
>
xx
</div>
</div>
</div>
<div
class="rc-steps-item rc-steps-item-wait"
>
<div
class="rc-steps-item-tail"
>
3
</div>
<div
class="rc-steps-item-icon"
>
<span
class="rc-steps-icon"
>
3
</span>
</div>
<div
class="rc-steps-item-content"
>
<div
class="rc-steps-item-title"
>
待运行
</div>
<div
class="rc-steps-item-description"
>
xx
</div>
</div>
</div>
<div
class="rc-steps-item rc-steps-item-wait"
>
<div
class="rc-steps-item-tail"
>
text
</div>
<div
class="rc-steps-item-icon"
>
<span
class="rc-steps-icon"
>
4
</span>
</div>
<div
class="rc-steps-item-content"
>
<div
class="rc-steps-item-title"
>
待运行
</div>
<div
class="rc-steps-item-description"
>
xx
</div>
</div>
</div>
</div>
`;

exports[`Steps render renders vertical correctly 1`] = `
<div
class="rc-steps rc-steps-vertical"
Expand Down
12 changes: 12 additions & 0 deletions tests/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,17 @@ describe('Steps', () => {
);
expect(wrapper).toMatchSnapshot();
});

it('renders step with tailContent', () => {
const wrapper = render(
<Steps>
<Step title="已完成" description="xx" tailContent="text" />
<Step title="进行中" description="xx" tailContent={<div>content</div>} />
<Step title="待运行" description="xx" tailContent={3} />
<Step title="待运行" description="xx" tailContent="text" />
</Steps>
);
expect(wrapper).toMatchSnapshot();
});
});
});