From eb828f0eba60f6e15a7a88c94345f25dbf10862f Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 27 Nov 2015 14:29:03 +0800 Subject: [PATCH] Fix disabled props in RadioGroup, closes #603 --- components/radio/demo/radiobutton.md | 2 +- components/radio/group.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/radio/demo/radiobutton.md b/components/radio/demo/radiobutton.md index 18d7b207bc..04c1ef5194 100644 --- a/components/radio/demo/radiobutton.md +++ b/components/radio/demo/radiobutton.md @@ -19,7 +19,7 @@ ReactDOM.render(
杭州 - 上海 + 上海 北京 成都 diff --git a/components/radio/group.jsx b/components/radio/group.jsx index 640ad73f95..bb29baeae5 100644 --- a/components/radio/group.jsx +++ b/components/radio/group.jsx @@ -42,7 +42,7 @@ export default React.createClass({ {...radio.props} onChange={this.onRadioChange} checked={this.state.value === radio.props.value} - disabled={this.props.disabled} + disabled={radio.props.disabled || this.props.disabled} />; } return radio;