Merge pull request react-bootstrap#1155 from AlexKVal/booleans

Explicitly set default values for boolean properties
tomlelouch · Aug 13, 2015 · defe43a · defe43a
2 parents df01f05 + c7e3f07
commit defe43a
Show file tree

Hide file tree

Showing 24 changed files with 119 additions and 15 deletions.
diff --git a/src/Badge.js b/src/Badge.js
@@ -8,6 +8,12 @@ const Badge = React.createClass({
     pullRight: React.PropTypes.bool
   },
 
+  getDefaultProps() {
+    return {
+      pullRight: false
+    };
+  },
+
   hasContent() {
     return ValidComponentChildren.hasValidComponent(this.props.children) ||
       (React.Children.count(this.props.children) > 1) ||

diff --git a/src/Button.js b/src/Button.js
@@ -28,8 +28,13 @@ const Button = React.createClass({
 
   getDefaultProps() {
     return {
+      active: false,
+      block: false,
       bsClass: 'button',
-      bsStyle: 'default'
+      bsStyle: 'default',
+      disabled: false,
+      navItem: false,
+      navDropdown: false
     };
   },
 

diff --git a/src/ButtonGroup.js b/src/ButtonGroup.js
@@ -25,7 +25,10 @@ const ButtonGroup = React.createClass({
 
   getDefaultProps() {
     return {
-      bsClass: 'button-group'
+      block: false,
+      bsClass: 'button-group',
+      justified: false,
+      vertical: false
     };
   },
 

diff --git a/src/CarouselItem.js b/src/CarouselItem.js
@@ -21,7 +21,9 @@ const CarouselItem = React.createClass({
 
   getDefaultProps() {
     return {
-      animation: true
+      active: false,
+      animateIn: false,
+      animateOut: false
     };
   },
 

diff --git a/src/CollapsibleNav.js b/src/CollapsibleNav.js
@@ -18,6 +18,12 @@ const CollapsibleNav = React.createClass({
     eventKey: React.PropTypes.any
   },
 
+  getDefaultProps() {
+    return {
+      collapsible: false,
+      expanded: false
+    };
+  },
 
   render() {
     /*

diff --git a/src/DropdownButton.js b/src/DropdownButton.js
@@ -30,6 +30,15 @@ const DropdownButton = React.createClass({
     children:  React.PropTypes.node
   },
 
+  getDefaultProps() {
+    return {
+      pullRight: false,
+      dropup: false,
+      navItem: false,
+      noCaret: false
+    };
+  },
+
   render() {
     let renderMethod = this.props.navItem ?
       'renderNavItem' : 'renderButtonGroup';

diff --git a/src/DropdownMenu.js b/src/DropdownMenu.js
@@ -10,6 +10,12 @@ const DropdownMenu = React.createClass({
     onSelect: React.PropTypes.func
   },
 
+  getDefaultProps() {
+    return {
+      pullRight: false
+    };
+  },
+
   render() {
     let classes = {
         'dropdown-menu': true,

diff --git a/src/FormGroup.js b/src/FormGroup.js
@@ -22,6 +22,7 @@ class FormGroup extends React.Component {
 }
 
 FormGroup.defaultProps = {
+  hasFeedback: false,
   standalone: false
 };
 

diff --git a/src/Grid.js b/src/Grid.js
@@ -18,7 +18,8 @@ const Grid = React.createClass({
 
   getDefaultProps() {
     return {
-      componentClass: 'div'
+      componentClass: 'div',
+      fluid: false
     };
   },
 

diff --git a/src/InputBase.js b/src/InputBase.js
@@ -228,4 +228,10 @@ InputBase.propTypes = {
   value: React.PropTypes.any
 };
 
+InputBase.defaultProps = {
+  disabled: false,
+  hasFeedback: false,
+  multiple: false
+};
+
 export default InputBase;
diff --git a/src/Interpolate.js b/src/Interpolate.js
@@ -16,7 +16,10 @@ const Interpolate = React.createClass({
   },
 
   getDefaultProps() {
-    return { component: 'span' };
+    return {
+      component: 'span',
+      unsafe: false
+    };
   },
 
   render() {

diff --git a/src/ListGroupItem.js b/src/ListGroupItem.js
@@ -21,7 +21,8 @@ const ListGroupItem = React.createClass({
 
   getDefaultProps() {
     return {
-      bsClass: 'list-group-item'
+      bsClass: 'list-group-item',
+      listItem: false
     };
   },
 

diff --git a/src/MenuItem.js b/src/MenuItem.js
@@ -17,7 +17,10 @@ const MenuItem = React.createClass({
 
   getDefaultProps() {
     return {
-      active: false
+      active: false,
+      divider: false,
+      disabled: false,
+      header: false
     };
   },
 

diff --git a/src/Nav.js b/src/Nav.js
@@ -43,7 +43,13 @@ const Nav = React.createClass({
   getDefaultProps() {
     return {
       bsClass: 'nav',
-      expanded: true
+      collapsible: false,
+      expanded: true,
+      justified: false,
+      navbar: false,
+      pullRight: false,
+      right: false,
+      stacked: false
     };
   },
 

diff --git a/src/NavItem.js b/src/NavItem.js
@@ -19,6 +19,13 @@ const NavItem = React.createClass({
     'aria-controls': React.PropTypes.string
   },
 
+  getDefaultProps() {
+    return {
+      active: false,
+      disabled: false
+    };
+  },
+
   render() {
     let {
         role,

diff --git a/src/Navbar.js b/src/Navbar.js
@@ -36,7 +36,13 @@ const Navbar = React.createClass({
       bsClass: 'navbar',
       bsStyle: 'default',
       role: 'navigation',
-      componentClass: 'nav'
+      componentClass: 'nav',
+      fixedTop: false,
+      fixedBottom: false,
+      staticTop: false,
+      inverse: false,
+      fluid: false,
+      defaultNavExpanded: false
     };
   },
 

diff --git a/src/Overlay.js b/src/Overlay.js
@@ -164,7 +164,9 @@ Overlay.propTypes = {
 };
 
 Overlay.defaultProps = {
-  animation: Fade
+  animation: Fade,
+  rootClose: false,
+  show: false
 };
 
 export default Overlay;
diff --git a/src/OverlayTrigger.js b/src/OverlayTrigger.js
@@ -95,14 +95,14 @@ const OverlayTrigger = React.createClass({
 
   getDefaultProps() {
     return {
+      defaultOverlayShown: false,
       trigger: ['hover', 'focus']
     };
   },
 
   getInitialState() {
     return {
-      isOverlayShown: this.props.defaultOverlayShown == null ?
-        false : this.props.defaultOverlayShown
+      isOverlayShown: this.props.defaultOverlayShown
     };
   },
 

diff --git a/src/PageItem.js b/src/PageItem.js
@@ -15,6 +15,14 @@ const PageItem = React.createClass({
     eventKey: React.PropTypes.any
   },
 
+  getDefaultProps() {
+    return {
+      disabled: false,
+      previous: false,
+      next: false
+    };
+  },
+
   render() {
     let classes = {
       'disabled': this.props.disabled,

diff --git a/src/PanelGroup.js b/src/PanelGroup.js
@@ -21,6 +21,7 @@ const PanelGroup = React.createClass({
 
   getDefaultProps() {
     return {
+      accordion: false,
       bsClass: 'panel-group'
     };
   },

diff --git a/src/ProgressBar.js b/src/ProgressBar.js
@@ -20,6 +20,9 @@ const ProgressBar = React.createClass({
     children: onlyProgressBar,
     className: React.PropTypes.string,
     interpolateClass: PropTypes.node,
+    /**
+     * @private
+     */
     isChild: PropTypes.bool
   },
 
@@ -29,7 +32,11 @@ const ProgressBar = React.createClass({
     return {
       bsClass: 'progress-bar',
       min: 0,
-      max: 100
+      max: 100,
+      active: false,
+      isChild: false,
+      srOnly: false,
+      striped: false
     };
   },
 

diff --git a/src/SplitButton.js b/src/SplitButton.js
@@ -29,7 +29,10 @@ const SplitButton = React.createClass({
 
   getDefaultProps() {
     return {
-      dropdownTitle: 'Toggle dropdown'
+      dropdownTitle: 'Toggle dropdown',
+      disabled: false,
+      dropup: false,
+      pullRight: false
     };
   },
 

diff --git a/src/SubNav.js b/src/SubNav.js
@@ -24,7 +24,9 @@ const SubNav = React.createClass({
 
   getDefaultProps() {
     return {
-      bsClass: 'nav'
+      bsClass: 'nav',
+      active: false,
+      disabled: false
     };
   },
 

diff --git a/src/Table.js b/src/Table.js
@@ -10,6 +10,16 @@ const Table = React.createClass({
     responsive: React.PropTypes.bool
   },
 
+  getDefaultProps() {
+    return {
+      bordered: false,
+      condensed: false,
+      hover: false,
+      responsive: false,
+      striped: false
+    };
+  },
+
   render() {
     let classes = {
       'table': true,
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ class FormGroup extends React.Component { @@
     }
     FormGroup.defaultProps = {
+      hasFeedback: false,
       standalone: false
     };
@@ Expand Down @@