Skip to content

Commit fb850fa

Browse files
author
jonisaa
committed
Merge remote-tracking branch 'origin/master'
2 parents cd785dd + f13945d commit fb850fa

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

demo/Server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ if (development) {
4545
}
4646

4747
app.listen(4000, '0.0.0.0', function () {
48-
console.log(colors.green(`React-metaform started at http://localhost:4000/. NODE_ENV: ${process.env.NODE_ENV}`));
48+
console.log(colors.green(`Redux-autoform started at http://localhost:4000/. NODE_ENV: ${process.env.NODE_ENV}`));
4949
});

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "redux-autoform-bootstrap-ui",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "Bootstrap UI implementation for redux-autoform",
55
"main": "./lib/index.js",
66
"scripts": {
@@ -74,7 +74,7 @@
7474
"react-hot-loader": "^1.3.0",
7575
"react-router": "^2.0.0",
7676
"react-router-redux": "^4.0.2",
77-
"redux-autoform": "^0.8.1",
77+
"redux-autoform": "^0.10.0",
7878
"redux-devtools": "^3.2.0",
7979
"redux-devtools-dock-monitor": "^1.1.1",
8080
"redux-devtools-log-monitor": "^1.0.9",

src/components/fieldComponents/Radio.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,23 @@ class Radio extends Component {
88
onChange(event.target.value);
99
};
1010

11-
getOptions = () => {
11+
getOptions = (value) => {
1212
let { options, name, fieldLayout } = this.props;
13-
let radioProps = { inline: fieldLayout == 'inline', name };
13+
14+
// these props don't vary per item
15+
let invariantRadioProps = { inline: fieldLayout == 'inline', name, onChange: this.handleChange };
1416

1517
return options.map((item, index) => (
16-
<BootstrapRadio key={index} value={item.value} onChange={this.handleChange} {...radioProps}>
18+
<BootstrapRadio key={index} value={item.value} checked={item.value == value} {...invariantRadioProps}>
1719
{item.text}
1820
</BootstrapRadio>
1921
))
2022
};
2123

2224
render() {
23-
let { error, touched, displayName, name, help, fieldLayout, innerSize } = this.props;
25+
let { error, touched, displayName, name, help, fieldLayout, innerSize, value } = this.props;
2426
let formGroupProps = { error, touched, displayName, name, help, fieldLayout, innerSize };
25-
let options = this.getOptions();
27+
let options = this.getOptions(value);
2628

2729
return (
2830
<FormGroup {...formGroupProps} >

0 commit comments

Comments
 (0)