feat: add Button.shape 'default' #32004
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
|
CI failed |
|
It's confusing that Button get same classNames How about use null or 'radius' instead? |
Codecov Report
@@ Coverage Diff @@
## master #32004 +/- ##
=======================================
Coverage 99.96% 99.96%
=======================================
Files 414 414
Lines 7566 7568 +2
Branches 2114 2116 +2
=======================================
+ Hits 7563 7565 +2
Misses 3 3
Continue to review full report at Codecov.
|
zombieJ
reviewed
Sep 10, 2021
components/button/button.tsx
Outdated
| @@ -241,7 +242,7 @@ const InternalButton: React.ForwardRefRenderFunction<unknown, ButtonProps> = (pr | |||
| prefixCls, | |||
| { | |||
| [`${prefixCls}-${type}`]: type, | |||
| [`${prefixCls}-${shape}`]: shape, | |||
| ...(shape && shape !== 'default' && { [`${prefixCls}-${shape}`]: true }), | |||
There was a problem hiding this comment.
Suggested change
| ...(shape && shape !== 'default' && { [`${prefixCls}-${shape}`]: true }), | |
| [`${prefixCls}-${shape}`]: shape !== 'default' && shape, |
There was a problem hiding this comment.
不行，之前就是这么写的，遇到这个 case 会挂
<Button type="default" shape="default" />
classnames({
ant-btn-default: true,
ant-btn-default: false,
})
就把 type default 的给覆盖掉了，我还尝试了 classnames(a, b) 这样的写法也不行
Rain120
pushed a commit
to Rain120/ant-design
that referenced
this pull request
Sep 14, 2021
* feat: add Button.shape 'default' * fix: ignore shape when falsy value * fix: generate className only when shape match * fix: remove necessary .ant-btn-default and update snapshot
afc163
added a commit
that referenced
this pull request
Sep 14, 2021
* feat: doc of week format in date-picker * feat: doc of week format in date-picker * fix: set the tree-switcher-leaf-line position (#32075) * fix(image): small size hide preview text (#29900) * fix(image): small size hide preview text * fix: image preview text ellipsis * fix: reset test * chore: improve icon search experience (#32098) * chore: improve icon search experience close #32097 * chore: search result empty data * feat: Georgian translation (#32106) * parent 18cd401 author Primlx <primulax@live.com> 1628778277 +0400 committer primulax <primulax@live.com> 1631181358 +0400 Add files via upload add georgian translation Create ka_GE.tsx Create ka_GE Rename ka_GE to ka_GE.tsx Create ka_GE.tsx Update ka_GE.tsx Update ka_GE.tsx Create ka_GE.tsx update rc-picker version Create ka_GE.tsx Create ka_GE Rename ka_GE to ka_GE.tsx Update ka_GE.tsx Update ka_GE.tsx Create ka_GE.tsx update rc-picker version * Update package.json Co-authored-by: Amumu <yoyo837@hotmail.com> * test case * add language option in markdown * test * Update components/calendar/locale/ka_GE.tsx Co-authored-by: Amumu <yoyo837@hotmail.com> * Update components/calendar/locale/ka_GE.tsx Co-authored-by: Amumu <yoyo837@hotmail.com> Co-authored-by: Amumu <yoyo837@hotmail.com> * docs: Update research-message-and-feedback.zh-CN.md (#32112) * fix: Use latest rc-picker version with defaultPickerValue/showTime fix (#32107) * update rc-picker dependency to 2.5.17 * add test: DatePicker.RangePicker with defaultPickerValue and showTime * fix: missing `default.css` (#32116) * chore: Add CI for compile * chore: Add missing compile file * docs: fix typo (#32121) * fix: preserve table pagination className (#32131) close #32130 * fix: use well typed PaginationLocale from rc-pagination (#32128) * docs: fix typo * fix: useMessage() should use getPopupContainer from <ConfigProvider />… (#31939) * fix:useMessage() should use getPopupContainer from <ConfigProvider /> #31841 * fix: useMessage() should use getPopupContainer from <ConfigProvider /> #31841 * add test case for useMessage hook * restore some changes * try to restore files agains * restore and keep the same as upstream master * restore files * restore some definition * feat: inherit rc-pagination props, more customizable (#32132) * feat: inherit rc-pagination props, more customizable close #32128, #32129 * chore: CustomSelect.Option is required by rc-pagination * fix: LocaleReceivier types issue * fix: lint issue, pageSize must be presented * chore: add Button.shape 'default' definition (#32004) * feat: add Button.shape 'default' * fix: ignore shape when falsy value * fix: generate className only when shape match * fix: remove necessary .ant-btn-default and update snapshot * fix: Cascader missing props (#32143) * fix: Cascader deps * docs: Update using new API * test: Test case cover * chore: compressed skip dup check * chore: remove redundant space after `should` (#32141) * chore(deps-dev): bump eslint-plugin-unicorn from 35.0.0 to 36.0.0 (#32149) Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 35.0.0 to 36.0.0. - [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases) - [Commits](sindresorhus/eslint-plugin-unicorn@v35.0.0...v36.0.0) --- updated-dependencies: - dependency-name: eslint-plugin-unicorn dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: fix modal demo in small screen * refactor(dropdown): add dropdownButtonType export and refactor defaultProps (#31957) Co-authored-by: btea <2356281422@qq.com> Co-authored-by: drizzlesconsin <69514654+drizzlesconsin@users.noreply.github.com> Co-authored-by: afc163 <afc163@gmail.com> Co-authored-by: Primlx <primulax@live.com> Co-authored-by: Amumu <yoyo837@hotmail.com> Co-authored-by: in_vane <52909860+in-vane@users.noreply.github.com> Co-authored-by: Thomas Zipner <thomas.zipner@gmail.com> Co-authored-by: 二货机器人 <smith3816@gmail.com> Co-authored-by: MD. Ariful Alam <swazan.arif@gmail.com> Co-authored-by: JounQin <admin@1stg.me> Co-authored-by: James <daoxingyue@live.cn> Co-authored-by: 绯一 <jaredleechn@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zuobin Wang <49583235+Dreamerryao@users.noreply.github.com>
1 task
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[中文版模板 / Chinese template]
🤔 This is a ...
🔗 Related issue link
💡 Background and solution
📝 Changelog
shapedefaultts definiton.☑️ Self Check before Merge