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

feat(select): customize remove/clear/menuItemSelected icons #12958

Merged
merged 3 commits into from Nov 12, 2018

Conversation

@chengcyber
Copy link
Contributor

@chengcyber chengcyber commented Nov 5, 2018

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 branch feature.
  • 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.

Related Issue: #12954

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.
@chengcyber chengcyber mentioned this pull request Nov 5, 2018
1 of 1 task complete
@netlify
Copy link

@netlify netlify bot commented Nov 5, 2018

Deploy preview for ant-design ready!

Built with commit 6fa4e57

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

@codecov
Copy link

@codecov codecov bot commented Nov 5, 2018

Codecov Report

Merging #12958 into feature will decrease coverage by 0.15%.
The diff coverage is 41.17%.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #12958      +/-   ##
===========================================
- Coverage    91.85%   91.69%   -0.16%     
===========================================
  Files          218      218              
  Lines         5683     5696      +13     
  Branches      1599     1644      +45     
===========================================
+ Hits          5220     5223       +3     
- Misses         458      466       +8     
- Partials         5        7       +2
Impacted Files Coverage Δ
components/select/index.tsx 82.75% <41.17%> (-17.25%) ⬇️
components/transfer/index.tsx 89.8% <0%> (ø) ⬆️
components/time-picker/index.tsx 81.96% <0%> (ø) ⬆️

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 1138438...6fa4e57. Read the comment docs.

components/select/index.tsx Outdated Show resolved Hide resolved
@zombieJ
Copy link
Member

@zombieJ zombieJ commented Nov 6, 2018

Pls help to update related docs.

@chengcyber chengcyber force-pushed the chengcyber:feature branch Nov 7, 2018
@chengcyber
Copy link
Contributor Author

@chengcyber chengcyber commented Nov 7, 2018

@afc163 @zombieJ Thanks for your code review. I append two more commits solving the className issue and update the doc.

components/select/index.en-US.md Outdated Show resolved Hide resolved
@chengcyber chengcyber force-pushed the chengcyber:feature branch 2 times, most recently Nov 7, 2018
@afc163
Copy link
Member

@afc163 afc163 commented Nov 8, 2018

ci broken, please rebase master to fix it.

@chengcyber chengcyber force-pushed the chengcyber:feature branch Nov 8, 2018
@chengcyber
Copy link
Contributor Author

@chengcyber chengcyber commented Nov 8, 2018

master rebased.

@afc163
Copy link
Member

@afc163 afc163 commented Nov 9, 2018

image

I don't think you are doing right.

@chengcyber chengcyber force-pushed the chengcyber:feature branch Nov 9, 2018
@chengcyber
Copy link
Contributor Author

@chengcyber chengcyber commented Nov 9, 2018

Hi, @afc163

// origin is this repo
git fetch origin master
git rebase origin/master

That's what I run.

Let's make it clear. Do you mean rebase feature branch instead of master?
Now, I revert back and rebase the latest feature branch to make the commits correct.

@afc163
Copy link
Member

@afc163 afc163 commented Nov 9, 2018

Sorry, you should rebase feature branch. It is my mistake of the comment above.

@chengcyber
Copy link
Contributor Author

@chengcyber chengcyber commented Nov 9, 2018

I rebased the latest feature branch, but still ci broken. After checking the ci logs, some doesn't come from my code. But I do change the select dom structure, and new select demo snapshots have been updated now.

@afc163
Copy link
Member

@afc163 afc163 commented Nov 9, 2018

a33e7a4

Rebase again, fixed it right now.

@chengcyber chengcyber force-pushed the chengcyber:feature branch Nov 9, 2018
@chengcyber
Copy link
Contributor Author

@chengcyber chengcyber commented Nov 9, 2018

update:
ci broken. It seems to me that a new property context added into Checkbox, Sider, Menu, Radio components, it breaks both lint & compile ci.

@afc163
Copy link
Member

@afc163 afc163 commented Nov 9, 2018

Rebase again 😆

@chengcyber chengcyber force-pushed the chengcyber:feature branch Nov 10, 2018
@chengcyber
Copy link
Contributor Author

@chengcyber chengcyber commented Nov 10, 2018

rebased, some lint errors 😕

@afc163
Copy link
Member

@afc163 afc163 commented Nov 11, 2018

Rebase again 😆...

@chengcyber chengcyber force-pushed the chengcyber:feature branch to 6fa4e57 Nov 12, 2018
@chengcyber
Copy link
Contributor Author

@chengcyber chengcyber commented Nov 12, 2018

sth changed in transfer and time-picker break two checks :-\

@afc163 afc163 merged commit c79d692 into ant-design:feature Nov 12, 2018
21 of 23 checks passed
21 of 23 checks passed
@codecov
codecov/patch 41.17% of diff hit (target 91.85%)
Details
@codecov
codecov/project 91.69% (-0.16%) compared to 1138438
Details
@netlify
Header rules No header rules processed
Details
@netlify
Pages changed 142 new files uploaded
Details
@netlify
Mixed content No mixed content detected
Details
@netlify
Redirect rules 18 redirect rules processed
Details
@wip
WIP Ready for review
Details
ci/circleci: compile Your tests passed on CircleCI!
Details
ci/circleci: dist Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: setup Your tests passed on CircleCI!
Details
ci/circleci: test_dist Your tests passed on CircleCI!
Details
ci/circleci: test_dist_15 Your tests passed on CircleCI!
Details
ci/circleci: test_dom Your tests passed on CircleCI!
Details
ci/circleci: test_dom_15 Your tests passed on CircleCI!
Details
ci/circleci: test_es Your tests passed on CircleCI!
Details
ci/circleci: test_es_15 Your tests passed on CircleCI!
Details
ci/circleci: test_lib Your tests passed on CircleCI!
Details
ci/circleci: test_lib_15 Your tests passed on CircleCI!
Details
ci/circleci: test_node Your tests passed on CircleCI!
Details
ci/circleci: test_node_15 Your tests passed on CircleCI!
Details
@netlify
deploy/netlify Deploy preview ready!
Details
security/snyk - package.json (paranoidjk) No manifest changes detected
@chengcyber chengcyber deleted the chengcyber:feature branch Nov 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants