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: add radio optionType api to set radio option type #24809

Merged
merged 8 commits into from Jun 11, 2020
Merged

Conversation

xrkffgg
Copy link
Member

@xrkffgg xrkffgg commented Jun 7, 2020

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Perfermance optimization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

close #24798

💡 Background and solution

23

📝 Changelog

Language Changelog
🇺🇸 English Add optionType api to set Radio type in Radio.Group when use options.
🇨🇳 Chinese 新增 optionType 来设置 Radio.Group使用 options时的 Radio 类型。

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • 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

View rendered components/radio/demo/radiogroup-options.md
View rendered components/radio/index.en-US.md
View rendered components/radio/index.zh-CN.md

@xrkffgg xrkffgg changed the title Feat radio com feat: add radio component api to set radio type Jun 7, 2020
@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented Jun 7, 2020

@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented Jun 7, 2020

options={optionsWithDisabled}
onChange={this.onChange4}
value={value4}
component="button"
Copy link
Member

@afc163 afc163 Jun 7, 2020

Choose a reason for hiding this comment

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

Suggested change
component="button"
component={Radio.Button}

Copy link
Member Author

@xrkffgg xrkffgg Jun 7, 2020

Choose a reason for hiding this comment

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

我是想直接用字符串来代表类型,button 简单一些

Copy link
Member

@afc163 afc163 Jun 7, 2020

Choose a reason for hiding this comment

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

这样更精确,本来的默认值就是 component={Radio}

Copy link
Member Author

@xrkffgg xrkffgg Jun 7, 2020

Choose a reason for hiding this comment

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

我先试试

Copy link
Member Author

@xrkffgg xrkffgg Jun 7, 2020

Choose a reason for hiding this comment

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

component 当个属性好弄。当组件,不太熟。明天再研究研究。😅😅😅

Copy link
Member

@zombieJ zombieJ Jun 8, 2020

Choose a reason for hiding this comment

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

用户如果传自定义组件,这里其实会有点问题。我们没有对应的样式。

ref #12852

Copy link
Member Author

@xrkffgg xrkffgg Jun 8, 2020

Choose a reason for hiding this comment

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

这个 功能 一直都被提起啊。。。

Copy link
Member

@zombieJ zombieJ Jun 8, 2020

Choose a reason for hiding this comment

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

嗯,当时关掉也是考虑 children 设置不同,这个 API 就矛盾了。其实基于那个在冲突的时候 warning 应该就行了。

Copy link
Member Author

@xrkffgg xrkffgg Jun 9, 2020

Choose a reason for hiding this comment

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

那这样 直接用个 type 方便点?

Copy link
Member

@zombieJ zombieJ Jun 9, 2020

Choose a reason for hiding this comment

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

嗯,我比较推荐 type。 @afc163

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Jun 7, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit dc1113d:

Sandbox Source
antd reproduction template Configuration

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Jun 7, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 462ff61:

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

@codecov codecov bot commented Jun 7, 2020

Codecov Report

Merging #24809 into feature will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #24809      +/-   ##
===========================================
- Coverage    99.33%   99.32%   -0.02%     
===========================================
  Files          369      369              
  Lines         7364     7367       +3     
  Branches      2061     2012      -49     
===========================================
+ Hits          7315     7317       +2     
- Misses          49       50       +1     
Impacted Files Coverage Δ
components/radio/group.tsx 100.00% <100.00%> (ø)
components/radio/radio.tsx 100.00% <100.00%> (ø)
components/_util/openAnimation.tsx 92.85% <0.00%> (-3.58%) ⬇️

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 c842fcc...462ff61. Read the comment docs.

@@ -61,20 +63,20 @@ const RadioGroup: React.FC<RadioGroupProps> = props => {
if (typeof option === 'string') {
// 此处类型自动推导为 string
return (
<Radio
<Component
Copy link
Member Author

@xrkffgg xrkffgg Jun 8, 2020

Choose a reason for hiding this comment

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

@afc163 @zombieJ

大佬帮忙看看,Radio.Button 没办法引,这样没起作用。

@xrkffgg
Copy link
Member Author

@xrkffgg xrkffgg commented Jun 10, 2020

改成了 optionType

@xrkffgg xrkffgg changed the title feat: add radio component api to set radio type feat: add radio optionType api to set radio option type Jun 10, 2020
@xrkffgg xrkffgg requested review from afc163 and zombieJ Jun 11, 2020
@@ -127,6 +134,7 @@ const RadioGroup: React.FC<RadioGroupProps> = props => {

RadioGroup.defaultProps = {
buttonStyle: 'outline' as RadioGroupButtonStyle,
optionType: 'default' as RadioGroupOptionType,
Copy link
Member

@zombieJ zombieJ Jun 11, 2020

Choose a reason for hiding this comment

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

不应该有 default,只有 options 时才有用,如果是 children 设置的话,需要 warning 说 optionType 无效。

@lgtm-com
Copy link

@lgtm-com lgtm-com bot commented Jun 11, 2020

This pull request introduces 1 alert when merging cc805a9 into c842fcc - view on LGTM.com

new alerts:

  • 1 for Unused variable, import, function or class

@xrkffgg xrkffgg requested a review from zombieJ Jun 11, 2020
afc163
afc163 approved these changes Jun 11, 2020
@afc163 afc163 merged commit aa6c0a1 into feature Jun 11, 2020
36 checks passed
@afc163 afc163 deleted the feat-radio-com branch Jun 11, 2020
chenshuai2144 added a commit that referenced this issue Jun 28, 2020
* feat: add successColor for Progress (#24655)

* feat: add successColor for Progress

* feat: update

* fix: update test

* remove snap

* feat: add test case

* refactor success

* feat: adjust styyle

* feat: add DevWarning

* feat: Support rowSelection.dirty (#24718)

* feat: Support rowSelection.dirty

* rename to reserveKeys

* preserveKeys will keep record also

* to preserveSelectedRowKeys

* feat: add ghost prop for collapse (#24734)

* feat: add ghost prop for collapse

* doc: version of collapse's ghost prop

* refactor: make ghost collapse's less code to a nested style

* chore: remove redundant codes in ghost collapse's less & doc

* doc: add a background wrapper for ghost collapse demo

* doc: dark-theme wrapper bg-color for ghost collapse demo

* test: update snapshot of ghost collapse

* doc: use softer bg-color on ghost collapse demo

* doc: remove disabled panel in ghost collapse demo

* feat: form instance support getFieldInstance (#24711)

* support getFieldInstance

* update doc

* fix lint

* move func

* move into hooks

* update ref logic

* fix lint

* rm only

* fix docs

* feat: dropdown support arrow (#23869)

* feat: dropdown support arrow prop

close #22758

* test: update snapshot

* fix: fix dropdown cls names

* test: update snapshot

* test: update snapshot

* doc: update demo

* test: update demo snapshot

* demo

* fix: snapshot

* chore: change the style of ghost collapse & demo modified (#24762)

* refactor: reduce content padding in ghost collapse

* doc: remove the wrapper outside ghost collapse

Designer want the demo differs from other demos

* refactor: remove redundant .less code in collapse

* feat: cascader dropdown-render prop (#24812)

* feat: cascader dropdown-render prop

* fix: update Cascader dropdownRender type annotation

* fix: set rc-cascader semver from ^ to ~

* docs: fix coding style in cascader/custom-dropdown

* feat: 🆕 support Drawer closeIcon (#24842)

* feat: 🆕 support Drawer closeIcon

close #19283
close #19153

* add test case

* update docs

* feat: 🆕 Cascader expandIcon (#24865)

* feat: cascader expandIcon

* fix: snap

* refactor: reduce CSS size (#24846)

* refactor: reduce button css size

* refactor: remove redundant button .less code

* feat: add Table onChange an action param (#24697)

* Working on tests

* created TableAction type

* changed TableActions to tuple

* removed chinese documentation line

* refactor TableActions

* fix documentation

* Moved action into extra param

* minor doc change

* feat: add closeIcon customize tag close (#24885)

* feat: add closeIcon customize tag close

* docs fix

* update snap

* fix: css name

* update snapshot

* snapshot

* feat: add radio `optionType` api to set radio option type (#24809)

* feat: radio component

* docs: update md

* fix: snap

* test components

* fix: use optionType

* fix name

* add warning

* fix

* feat: expand rate character (#24903)

* feat: expand rate character

* fix: demo

* fix: snap

* Update components/rate/index.zh-CN.md

Co-authored-by: 偏右 <afc163@gmail.com>

* fix

Co-authored-by: 偏右 <afc163@gmail.com>

* Refactor demo code box actions (#24887)

* refactor: refine the styling of actions part of demo code-box

* fix: lint style

* refactor: move Result children to end (#24945)

* feat: remove content max-width on dot-step (#24907)

* feat: add Skeleton-Image (#24805)

* feat: add Skeleton-Image

* feat: add docs

* fix: adjust skeleton

* feat: adjust Image Component

* feat: rebase

* feat: adjust style

* fix: lint

* feat: remove size

* feat: delete md

* feat: fix style

*  feat: Mentions support autoSize (#24961)

close #17746

* chore: replace textarea with rc-textarea (#24966)

* feat: update pagination@2.3.0 support onChange called when pageSize change (#24964)

* feat: update pagination@2.5.0 and add test case to relative component

* fix: lint

* delete

* feat: add test case for pagination

* adjust test case

* feat: Implement centered prop in Tabs (#24958)

* Implement centered in Tabs along with its tests and docs

* Fix build error

* Add Chinese translations and remove test case

Co-authored-by: Ashkan Pourghasem <ashkan.pourghasem@gmail.com>

* feat: Add modal style parameter (#24773)

* add some paramters in default.less

* Update components/style/themes/default.less

Co-authored-by: Amumu <yoyo837@hotmail.com>

* change parameter in compact.less

Co-authored-by: Crystal Gao <jinggao@ebay.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>

* feat: export Tabs addIcon (#25006)

* feat: export Tabs addIcon

* update snapshot

* feat: showNow on timepicker and datetimepicker (#25032)

* feat: update rc-picker@1.7.1 and fix icons of month and quarter picker in DatePicker Component (#25035)

* feat: update rc-picker@1.7.1

* delete

* add

* feat: expand rate support props (#24993)

* docs: 📝 Add Form.Item hidden in doc (#25108)

close #25101

* fix: ⌨️ Improve Pagination accessibility issue (#25119)

* ⌨️ Improve Pagination a11y by fixing a W3C error

react-component/pagination#280

* update snapshot

* 🆙 rc-pagination to 2.4.1

* feat: support triggerSubMenuAction for <Menu /> (#25127)

* feat(menu): add triggerSubMenuAction for Menu

* feat(menu): test cases

* chore: Adjust picker logic (#25135)

* chore: update rc-picker 1.10.0 (#25174)

* feat: table row check strictly (#24931)

* feat: add checkStrictly on Table.rowSelection

* fix: LGTM warnings

* test: table rowSelection.checkStrictly

* test: add cov [wip]

* refactor: tree.rowSelection.checkStrictly [wip]

* test: table.rowSelection.checkStrictly basic case

* feat: support rowKey on checkStrictly table

* feat: Table checkStrictly support getCheckboxProps

* docs: Table checkStrictly

* chore: typo

* chore: remove useless comment

* chore: update snapshot

* chore: update snapshot

* fix: fire selectAll on selection dropdown menu & changeRows incorrect in selectAll callback

* docs: typo

* chore

* chore

* fix: expand buttons of leaf rows in tree data are not hidden

* feat: Table warning about rowKey index parameter

* perf: only generate keyEntities when not checkStrictly

* refactor: remove useless parseCheckedKeys

* refactor: get derived selected & half selected keys from selectedRowKeys

* chore: remove env condition stmt

* chore: revert index usage & code formatting

* chore: rerun ci

* docs: table tree-data checkstrictly

* test: update snapshots

* refactor: use useMergedState hook

* chore: rerun ci

* chore: rerun ci 2

* chore: revert selection select all behavior

* refactor: refactor code based on feature

* chore: revert table code format

* chore: revert table code format

* fix: useMemo deps

* fix: useMemo deps

* fix: useMemo deps

* feat: support preserve (#25186)

* docs: add responsibly order for Col (#25139)

* feat: add type

* feat: add responsibly order cols

* feat: add docs

* feat: add test case

* fix test

Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: 偏右 <afc163@gmail.com>
Co-authored-by: zoomdong <1344492820@qq.com>
Co-authored-by: 07akioni <07akioni2@gmail.com>
Co-authored-by: wendellhu <wendellhu95@gmail.com>
Co-authored-by: xrkffgg <xrkffgg@gmail.com>
Co-authored-by: Neto Braghetto <netow93@gmail.com>
Co-authored-by: Kermit Xuan <kermitlx@outlook.com>
Co-authored-by: Ashkan Pourghasem <64011067+ashkan-pm@users.noreply.github.com>
Co-authored-by: Ashkan Pourghasem <ashkan.pourghasem@gmail.com>
Co-authored-by: hicrystal <295247343@qq.com>
Co-authored-by: Crystal Gao <jinggao@ebay.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: Li Ming <armyiljfe@gmail.com>
@chenshuai2144 chenshuai2144 mentioned this pull request Jun 29, 2020
13 tasks
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

4 participants