Skip to content

Commit defe43a

Browse files
committed
Merge pull request react-bootstrap#1155 from AlexKVal/booleans
Explicitly set default values for boolean properties
2 parents df01f05 + c7e3f07 commit defe43a

24 files changed

+119
-15
lines changed

src/Badge.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ const Badge = React.createClass({
88
pullRight: React.PropTypes.bool
99
},
1010

11+
getDefaultProps() {
12+
return {
13+
pullRight: false
14+
};
15+
},
16+
1117
hasContent() {
1218
return ValidComponentChildren.hasValidComponent(this.props.children) ||
1319
(React.Children.count(this.props.children) > 1) ||

src/Button.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ const Button = React.createClass({
2828

2929
getDefaultProps() {
3030
return {
31+
active: false,
32+
block: false,
3133
bsClass: 'button',
32-
bsStyle: 'default'
34+
bsStyle: 'default',
35+
disabled: false,
36+
navItem: false,
37+
navDropdown: false
3338
};
3439
},
3540

src/ButtonGroup.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ const ButtonGroup = React.createClass({
2525

2626
getDefaultProps() {
2727
return {
28-
bsClass: 'button-group'
28+
block: false,
29+
bsClass: 'button-group',
30+
justified: false,
31+
vertical: false
2932
};
3033
},
3134

src/CarouselItem.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ const CarouselItem = React.createClass({
2121

2222
getDefaultProps() {
2323
return {
24-
animation: true
24+
active: false,
25+
animateIn: false,
26+
animateOut: false
2527
};
2628
},
2729

src/CollapsibleNav.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ const CollapsibleNav = React.createClass({
1818
eventKey: React.PropTypes.any
1919
},
2020

21+
getDefaultProps() {
22+
return {
23+
collapsible: false,
24+
expanded: false
25+
};
26+
},
2127

2228
render() {
2329
/*

src/DropdownButton.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ const DropdownButton = React.createClass({
3030
children: React.PropTypes.node
3131
},
3232

33+
getDefaultProps() {
34+
return {
35+
pullRight: false,
36+
dropup: false,
37+
navItem: false,
38+
noCaret: false
39+
};
40+
},
41+
3342
render() {
3443
let renderMethod = this.props.navItem ?
3544
'renderNavItem' : 'renderButtonGroup';

src/DropdownMenu.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ const DropdownMenu = React.createClass({
1010
onSelect: React.PropTypes.func
1111
},
1212

13+
getDefaultProps() {
14+
return {
15+
pullRight: false
16+
};
17+
},
18+
1319
render() {
1420
let classes = {
1521
'dropdown-menu': true,

src/FormGroup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class FormGroup extends React.Component {
2222
}
2323

2424
FormGroup.defaultProps = {
25+
hasFeedback: false,
2526
standalone: false
2627
};
2728

src/Grid.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ const Grid = React.createClass({
1818

1919
getDefaultProps() {
2020
return {
21-
componentClass: 'div'
21+
componentClass: 'div',
22+
fluid: false
2223
};
2324
},
2425

src/InputBase.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,4 +228,10 @@ InputBase.propTypes = {
228228
value: React.PropTypes.any
229229
};
230230

231+
InputBase.defaultProps = {
232+
disabled: false,
233+
hasFeedback: false,
234+
multiple: false
235+
};
236+
231237
export default InputBase;

src/Interpolate.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ const Interpolate = React.createClass({
1616
},
1717

1818
getDefaultProps() {
19-
return { component: 'span' };
19+
return {
20+
component: 'span',
21+
unsafe: false
22+
};
2023
},
2124

2225
render() {

src/ListGroupItem.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ const ListGroupItem = React.createClass({
2121

2222
getDefaultProps() {
2323
return {
24-
bsClass: 'list-group-item'
24+
bsClass: 'list-group-item',
25+
listItem: false
2526
};
2627
},
2728

src/MenuItem.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ const MenuItem = React.createClass({
1717

1818
getDefaultProps() {
1919
return {
20-
active: false
20+
active: false,
21+
divider: false,
22+
disabled: false,
23+
header: false
2124
};
2225
},
2326

src/Nav.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ const Nav = React.createClass({
4343
getDefaultProps() {
4444
return {
4545
bsClass: 'nav',
46-
expanded: true
46+
collapsible: false,
47+
expanded: true,
48+
justified: false,
49+
navbar: false,
50+
pullRight: false,
51+
right: false,
52+
stacked: false
4753
};
4854
},
4955

src/NavItem.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ const NavItem = React.createClass({
1919
'aria-controls': React.PropTypes.string
2020
},
2121

22+
getDefaultProps() {
23+
return {
24+
active: false,
25+
disabled: false
26+
};
27+
},
28+
2229
render() {
2330
let {
2431
role,

src/Navbar.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@ const Navbar = React.createClass({
3636
bsClass: 'navbar',
3737
bsStyle: 'default',
3838
role: 'navigation',
39-
componentClass: 'nav'
39+
componentClass: 'nav',
40+
fixedTop: false,
41+
fixedBottom: false,
42+
staticTop: false,
43+
inverse: false,
44+
fluid: false,
45+
defaultNavExpanded: false
4046
};
4147
},
4248

src/Overlay.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,9 @@ Overlay.propTypes = {
164164
};
165165

166166
Overlay.defaultProps = {
167-
animation: Fade
167+
animation: Fade,
168+
rootClose: false,
169+
show: false
168170
};
169171

170172
export default Overlay;

src/OverlayTrigger.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ const OverlayTrigger = React.createClass({
9595

9696
getDefaultProps() {
9797
return {
98+
defaultOverlayShown: false,
9899
trigger: ['hover', 'focus']
99100
};
100101
},
101102

102103
getInitialState() {
103104
return {
104-
isOverlayShown: this.props.defaultOverlayShown == null ?
105-
false : this.props.defaultOverlayShown
105+
isOverlayShown: this.props.defaultOverlayShown
106106
};
107107
},
108108

src/PageItem.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ const PageItem = React.createClass({
1515
eventKey: React.PropTypes.any
1616
},
1717

18+
getDefaultProps() {
19+
return {
20+
disabled: false,
21+
previous: false,
22+
next: false
23+
};
24+
},
25+
1826
render() {
1927
let classes = {
2028
'disabled': this.props.disabled,

src/PanelGroup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const PanelGroup = React.createClass({
2121

2222
getDefaultProps() {
2323
return {
24+
accordion: false,
2425
bsClass: 'panel-group'
2526
};
2627
},

src/ProgressBar.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ const ProgressBar = React.createClass({
2020
children: onlyProgressBar,
2121
className: React.PropTypes.string,
2222
interpolateClass: PropTypes.node,
23+
/**
24+
* @private
25+
*/
2326
isChild: PropTypes.bool
2427
},
2528

@@ -29,7 +32,11 @@ const ProgressBar = React.createClass({
2932
return {
3033
bsClass: 'progress-bar',
3134
min: 0,
32-
max: 100
35+
max: 100,
36+
active: false,
37+
isChild: false,
38+
srOnly: false,
39+
striped: false
3340
};
3441
},
3542

src/SplitButton.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ const SplitButton = React.createClass({
2929

3030
getDefaultProps() {
3131
return {
32-
dropdownTitle: 'Toggle dropdown'
32+
dropdownTitle: 'Toggle dropdown',
33+
disabled: false,
34+
dropup: false,
35+
pullRight: false
3336
};
3437
},
3538

src/SubNav.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ const SubNav = React.createClass({
2424

2525
getDefaultProps() {
2626
return {
27-
bsClass: 'nav'
27+
bsClass: 'nav',
28+
active: false,
29+
disabled: false
2830
};
2931
},
3032

src/Table.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ const Table = React.createClass({
1010
responsive: React.PropTypes.bool
1111
},
1212

13+
getDefaultProps() {
14+
return {
15+
bordered: false,
16+
condensed: false,
17+
hover: false,
18+
responsive: false,
19+
striped: false
20+
};
21+
},
22+
1323
render() {
1424
let classes = {
1525
'table': true,

0 commit comments

Comments
 (0)