Skip to content

Commit 67eec7c

Browse files
committed
fix: update disabled radiogroup's classname
1 parent 5192859 commit 67eec7c

File tree

2 files changed

+22
-29
lines changed

2 files changed

+22
-29
lines changed

components/radio/Radio.jsx

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,6 @@ export default {
4141
}
4242
})
4343
},
44-
computed: {
45-
classes () {
46-
const { prefixCls, disabled, stateChecked } = this
47-
return {
48-
[`${prefixCls}-wrapper`]: true,
49-
[`${prefixCls}-wrapper-checked`]: stateChecked,
50-
[`${prefixCls}-wrapper-disabled`]: disabled,
51-
}
52-
},
53-
checkboxClass () {
54-
const { prefixCls, disabled, stateChecked } = this
55-
return {
56-
[`${prefixCls}`]: true,
57-
[`${prefixCls}-checked`]: stateChecked,
58-
[`${prefixCls}-disabled`]: disabled,
59-
}
60-
},
61-
},
6244
methods: {
6345
handleChange (event) {
6446
const targetChecked = event.target.checked
@@ -114,7 +96,7 @@ export default {
11496
},
11597
},
11698
render () {
117-
const { id, classes, checkboxClass, prefixCls,
99+
const { id, prefixCls,
118100
stateChecked, handleChange, $slots,
119101
onFocus,
120102
onBlur,
@@ -127,9 +109,20 @@ export default {
127109
name = radioGroupContext.name
128110
disabled = disabled || radioGroupContext.disabled
129111
}
112+
const wrapperClassString = {
113+
[`${prefixCls}-wrapper`]: true,
114+
[`${prefixCls}-wrapper-checked`]: stateChecked,
115+
[`${prefixCls}-wrapper-disabled`]: disabled,
116+
}
117+
const checkboxClass = {
118+
[`${prefixCls}`]: true,
119+
[`${prefixCls}-checked`]: stateChecked,
120+
[`${prefixCls}-disabled`]: disabled,
121+
}
122+
130123
return (
131124
<label
132-
class={classes}
125+
class={wrapperClassString}
133126
onMouseenter={onMouseEnter}
134127
onMouseleave={onMouseLeave}
135128
>

components/radio/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ exports[`renders ./components/radio/demo/radioButton.md correctly 1`] = `
3333
</div>
3434
<div style="margin-top: 16px;">
3535
<div class="ant-radio-group ant-radio-group-default">
36-
<label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Hangzhou</span></label>
37-
<label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Shanghai</span></label>
38-
<label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Beijing</span></label>
39-
<label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Chengdu</span></label>
36+
<label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked ant-radio-button-wrapper-disabled"><span class="ant-radio-button ant-radio-button-checked ant-radio-button-disabled"><input type="radio" disabled="disabled" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Hangzhou</span></label>
37+
<label class="ant-radio-button-wrapper ant-radio-button-wrapper-disabled"><span class="ant-radio-button ant-radio-button-disabled"><input type="radio" disabled="disabled" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Shanghai</span></label>
38+
<label class="ant-radio-button-wrapper ant-radio-button-wrapper-disabled"><span class="ant-radio-button ant-radio-button-disabled"><input type="radio" disabled="disabled" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Beijing</span></label>
39+
<label class="ant-radio-button-wrapper ant-radio-button-wrapper-disabled"><span class="ant-radio-button ant-radio-button-disabled"><input type="radio" disabled="disabled" class="ant-radio-button-input"><span class="ant-radio-button-inner"></span></span><span>Chengdu</span></label>
4040
</div>
4141
</div>
4242
</div>
@@ -79,17 +79,17 @@ exports[`renders ./components/radio/demo/radioGroup-options.md correctly 1`] = `
7979
<div class="ant-radio-group ant-radio-group-default">
8080
<label class="ant-radio-wrapper ant-radio-wrapper-checked ant-radio-wrapper-disabled"><span class="ant-radio ant-radio-checked ant-radio-disabled"><input type="radio" disabled="disabled" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>Apple</span></label>
8181
<label class="ant-radio-wrapper ant-radio-wrapper-disabled"><span class="ant-radio ant-radio-disabled"><input type="radio" disabled="disabled" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>Pear</span></label>
82-
<label class="ant-radio-wrapper"><span class="ant-radio"><input type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>Orange</span></label>
82+
<label class="ant-radio-wrapper ant-radio-wrapper-disabled"><span class="ant-radio ant-radio-disabled"><input type="radio" disabled="disabled" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>Orange</span></label>
8383
</div>
8484
</div>
8585
`;
8686
8787
exports[`renders ./components/radio/demo/radioGroup-with-name.md correctly 1`] = `
8888
<div class="ant-radio-group ant-radio-group-default">
89-
<label class="ant-radio-wrapper ant-radio-wrapper-checked"><span class="ant-radio ant-radio-checked"><input type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>A</span></label>
90-
<label class="ant-radio-wrapper"><span class="ant-radio"><input type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>B</span></label>
91-
<label class="ant-radio-wrapper"><span class="ant-radio"><input type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>C</span></label>
92-
<label class="ant-radio-wrapper"><span class="ant-radio"><input type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>D</span></label>
89+
<label class="ant-radio-wrapper ant-radio-wrapper-checked"><span class="ant-radio ant-radio-checked"><input name="radioGroup" type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>A</span></label>
90+
<label class="ant-radio-wrapper"><span class="ant-radio"><input name="radioGroup" type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>B</span></label>
91+
<label class="ant-radio-wrapper"><span class="ant-radio"><input name="radioGroup" type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>C</span></label>
92+
<label class="ant-radio-wrapper"><span class="ant-radio"><input name="radioGroup" type="radio" class="ant-radio-input"><span class="ant-radio-inner"></span></span><span>D</span></label>
9393
</div>
9494
`;
9595

0 commit comments

Comments
 (0)