Fix the bug<Button>{0}</Button> display abnormal #8733

Cuihongsen · 2017-12-26T03:57:33Z

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

Make sure that you propose PR to right branch: bugfix for master, feature for latest active branch feature-x.x.
Make sure that you follow antd's code convention.
Run npm run lint and fix those errors before submitting in order to keep consistent code style.
Rebase before creating a PR to keep commit history clear.
Add some descriptions and refer relative issues for you PR.

Extra checklist:

if isBugFix :

Make sure that you add at least one unit test for the bug which you had fixed.

elif isNewFeature :

Update API docs for the component.
Update/Add demo to demonstrate new feature.
Update TypeScript definition for the component.
Add unit tests for the feature.

…tively

yesmeck · 2017-12-27T02:01:27Z

components/button/button.tsx

@@ -160,7 +160,8 @@ export default class Button extends React.Component<ButtonProps, any> {
    const iconType = loading ? 'loading' : icon;
    const iconNode = iconType ? <Icon type={iconType} /> : null;
    const needInserted = React.Children.count(children) === 1 && (!iconType || iconType === 'loading');
-    const kids = children ? React.Children.map(children, child => insertSpace(child, needInserted)) : null;
+    // tslint:disable-next-line:max-line-length


Just break it to two lines.

danedavid · 2017-12-27T09:52:40Z

Fixes #8728

afc163 · 2018-01-07T12:44:06Z

ping~

codecov · 2018-01-08T11:56:41Z

Codecov Report

Merging #8733 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #8733   +/-   ##
=======================================
  Coverage   85.32%   85.32%           
=======================================
  Files         227      227           
  Lines        4695     4695           
  Branches     1375     1375           
=======================================
  Hits         4006     4006           
  Misses        689      689

Impacted Files	Coverage Δ
components/button/button.tsx	`92.3% <ø> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a3c5352...7ae714c. Read the comment docs.

Cuihongsen added 5 commits December 26, 2017 10:30

修复了<Button>{0}</Button> 显示异常的bug

5fa23bb

Fix the bug<Button>{0}</Button> display abnormal

efca8a9

Fix the bug<Button>{0}</Button> display abnormal

d28d355

Unit test writing error

7c071eb

Unit tests were added to test the rendering of {0}, 0, {false} respec…

fa5693d

…tively

yesmeck reviewed Dec 27, 2017

View reviewed changes

yesmeck mentioned this pull request Dec 27, 2017

Fix {0} child inside button #8752

Closed

Merge branch 'master' into bugfix

7ae714c

afc163 merged commit eac76df into ant-design:master Jan 9, 2018

Fix the bug<Button>{0}</Button> display abnormal #8733

Fix the bug<Button>{0}</Button> display abnormal #8733

Cuihongsen commented Dec 26, 2017 •

edited

yesmeck Dec 27, 2017

danedavid commented Dec 27, 2017

afc163 commented Jan 7, 2018

codecov bot commented Jan 8, 2018 •

edited

Fix the bug<Button>{0}</Button> display abnormal #8733

Fix the bug<Button>{0}</Button> display abnormal #8733

Conversation

Cuihongsen commented Dec 26, 2017 • edited

yesmeck Dec 27, 2017

Choose a reason for hiding this comment

danedavid commented Dec 27, 2017

afc163 commented Jan 7, 2018

codecov bot commented Jan 8, 2018 • edited

Codecov Report

Cuihongsen commented Dec 26, 2017 •

edited

codecov bot commented Jan 8, 2018 •

edited