Skip to content
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.

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

fix: should color style works on Badge #15356

Merged
merged 1 commit into from Mar 14, 2019
Merged

fix: should color style works on Badge #15356

merged 1 commit into from Mar 14, 2019

Conversation

DiamondYuan
Copy link
Contributor

@DiamondYuan DiamondYuan commented Mar 12, 2019

First of all, thank you for your contribution! 😄

New feature please send pull request to feature branch, and rest to master branch.
Pull request will be merged after one of collaborators approve.
Please makes sure that these form are filled before submitting your pull request, thank you!

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Branch merge
  • Other (about what?)

👻 What's the background?

  1. Describe the source of requirement, like related issue link.

  2. Describe the problem and the scenario.

💡 Solution

  1. How to fix the problem, and list final API implementation and usage sample if that is an new feature.

  2. GIF or snapshot should be provided if includes UI/interactive modification.

📝 Changelog description

Describe changes from userside, and list all potential break changes or other risks.

  1. English description

  2. Chinese description (optional)

☑️ Self Check before Merge

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@DiamondYuan
Copy link
Contributor Author

#15349

@DiamondYuan DiamondYuan reopened this Mar 12, 2019
@DiamondYuan
Copy link
Contributor Author

DiamondYuan commented Mar 12, 2019

很奇怪的本地测试没报错

@netlify
Copy link

netlify bot commented Mar 12, 2019

Deploy preview for ant-design ready!

Built with commit 0039ea0

https://deploy-preview-15356--ant-design.netlify.com

@DiamondYuan DiamondYuan requested a review from afc163 March 13, 2019 00:19
@DiamondYuan
Copy link
Contributor Author

@zombieJ ci broken

@@ -33,6 +37,8 @@ ReactDOM.render(
<Badge status="processing" text="Processing" />
<br />
<Badge status="warning" text="Warning" />
<br />
<Badge style={style} status="success" text="Success" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不用特地放在 demo 里。

// https://github.com/ant-design/ant-design/issues/15349
it('should color style works on Badge', () => {
const wrapper = render(<Badge style={{ color: 'red' }} status="success" text="Success" />);
expect(wrapper.find('.ant-badge-status-text').get(0).attribs.style).toBe('color:red');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

=> xxx.props().style.color & toBe('red')

@zombieJ
Copy link
Member

zombieJ commented Mar 13, 2019

@zombieJ ci broken

merge master

@DiamondYuan
Copy link
Contributor Author

@zombieJ ci broken

merge master

master 跪了。

@zombieJ
Copy link
Member

zombieJ commented Mar 13, 2019

嗯,enzyme bug:enzymejs/enzyme#2046

@codecov
Copy link

codecov bot commented Mar 14, 2019

Codecov Report

Merging #15356 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #15356      +/-   ##
==========================================
+ Coverage   94.27%   94.27%   +<.01%     
==========================================
  Files         250      250              
  Lines        6640     6642       +2     
  Branches     1940     1927      -13     
==========================================
+ Hits         6260     6262       +2     
  Misses        379      379              
  Partials        1        1
Impacted Files Coverage Δ
components/badge/index.tsx 100% <100%> (ø) ⬆️

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 a08a9da...0039ea0. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Mar 14, 2019

Codecov Report

Merging #15356 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #15356      +/-   ##
==========================================
+ Coverage   94.27%   94.27%   +<.01%     
==========================================
  Files         250      250              
  Lines        6640     6642       +2     
  Branches     1940     1927      -13     
==========================================
+ Hits         6260     6262       +2     
  Misses        379      379              
  Partials        1        1
Impacted Files Coverage Δ
components/badge/index.tsx 100% <100%> (ø) ⬆️

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 a08a9da...0039ea0. Read the comment docs.

@zombieJ zombieJ merged commit 59d996b into ant-design:master Mar 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants