From 93c435bc4d597f3a3971feebe74325b420c21f7a Mon Sep 17 00:00:00 2001 From: ylove Date: Mon, 5 Dec 2016 12:39:54 -0500 Subject: [PATCH 1/3] Allowed for an optional 'disabled' property to be passed to buttonGroup. --- components/ButtonGroup.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/ButtonGroup.jsx b/components/ButtonGroup.jsx index 35000f4..1685267 100644 --- a/components/ButtonGroup.jsx +++ b/components/ButtonGroup.jsx @@ -13,7 +13,8 @@ var ButtonGroup = React.createClass({ buttons: React.PropTypes.arrayOf(React.PropTypes.shape({ value: React.PropTypes.any.isRequired, content: React.PropTypes.node, - title: React.PropTypes.string + title: React.PropTypes.string, + disabled: React.PropTypes.bool })).isRequired, onClick: React.PropTypes.func.isRequired, className: React.PropTypes.string From 032fe5c95cda715617d0ae7614da7152b04c454a Mon Sep 17 00:00:00 2001 From: ylove Date: Mon, 5 Dec 2016 15:26:23 -0500 Subject: [PATCH 2/3] Making sure disabled prop gets passed down. --- components/ButtonGroup.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/ButtonGroup.jsx b/components/ButtonGroup.jsx index 1685267..2b601c9 100644 --- a/components/ButtonGroup.jsx +++ b/components/ButtonGroup.jsx @@ -35,6 +35,7 @@ var ButtonGroup = React.createClass({ onClick={this._handleClick} text={button.content || "" + button.value} className="button-group-button" + disabled={!!this.props.disabled} /> ); }, this); From dce9289a0fee66818a6d2dbbc4a116e06849c428 Mon Sep 17 00:00:00 2001 From: ylove Date: Mon, 5 Dec 2016 15:35:32 -0500 Subject: [PATCH 3/3] Fixing disabled prop --- components/ButtonGroup.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ButtonGroup.jsx b/components/ButtonGroup.jsx index 2b601c9..f53a2e4 100644 --- a/components/ButtonGroup.jsx +++ b/components/ButtonGroup.jsx @@ -35,7 +35,7 @@ var ButtonGroup = React.createClass({ onClick={this._handleClick} text={button.content || "" + button.value} className="button-group-button" - disabled={!!this.props.disabled} + disabled={!!button.disabled} /> ); }, this);