[EnhancedSwitch] Adjust the way defaultChecked is passed to prevent f…

…iring react warnings in v15 RE controlled inputs

src/Checkbox/Checkbox.js

@@ -68,6 +68,9 @@ class Checkbox extends React.Component {
 
     /**
      * The default state of our checkbox component.
+     * **Warning:** This cannot be used in conjunction with `checked`.
+     * Decide between using a controlled or uncontrolled input element and remove one of these props.
+     * More info: https://fb.me/react-controlled-components
      */
     defaultChecked: React.PropTypes.bool,
 
@@ -129,7 +132,6 @@ class Checkbox extends React.Component {
   };
 
   static defaultProps = {
-    defaultChecked: false,
     labelPosition: 'right',
     disabled: false,
   };
@@ -232,7 +234,6 @@ class Checkbox extends React.Component {
       onSwitch: this.handleCheck,
       labelStyle: labelStyle,
       onParentShouldUpdate: this.handleStateChange,
-      defaultSwitched: this.props.defaultChecked,
       labelPosition: this.props.labelPosition,
     };
 

src/Toggle/Toggle.js

@@ -70,6 +70,9 @@ class Toggle extends React.Component {
   static propTypes = {
     /**
      * Determines whether the Toggle is initially turned on.
+     * **Warning:** This cannot be used in conjunction with `toggled`.
+     * Decide between using a controlled or uncontrolled input element and remove one of these props.
+     * More info: https://fb.me/react-controlled-components
      */
     defaultToggled: React.PropTypes.bool,
 
@@ -182,7 +185,9 @@ class Toggle extends React.Component {
 
   render() {
     const {
+      defaultToggled,
       onToggle, // eslint-disable-line no-unused-vars
+      toggled,
       ...other,
     } = this.props;
 
@@ -247,11 +252,14 @@ class Toggle extends React.Component {
       switched: this.state.switched,
       onSwitch: this.handleToggle,
       onParentShouldUpdate: this.handleStateChange,
-      defaultSwitched: this.props.defaultToggled,
       labelPosition: this.props.labelPosition,
     };
 
-    if (this.props.hasOwnProperty('toggled')) enhancedSwitchProps.checked = this.props.toggled;
+    if (this.props.hasOwnProperty('toggled')) {
+      enhancedSwitchProps.checked = toggled;
+    } else if (this.props.hasOwnProperty('defaultToggled')) {
+      enhancedSwitchProps.defaultChecked = defaultToggled;
+    }
 
     return (
       <EnhancedSwitch

src/internal/EnhancedSwitch.js

@@ -71,7 +71,7 @@ class EnhancedSwitch extends React.Component {
   static propTypes = {
     checked: React.PropTypes.bool,
     className: React.PropTypes.string,
-    defaultSwitched: React.PropTypes.bool,
+    defaultChecked: React.PropTypes.bool,
     disableFocusRipple: React.PropTypes.bool,
     disableTouchRipple: React.PropTypes.bool,
     disabled: React.PropTypes.bool,
@@ -121,11 +121,11 @@ class EnhancedSwitch extends React.Component {
     const hasCheckedProp = nextProps.hasOwnProperty('checked');
     const hasToggledProp = nextProps.hasOwnProperty('toggled');
     const hasNewDefaultProp =
-      (nextProps.hasOwnProperty('defaultSwitched') &&
-      (nextProps.defaultSwitched !== this.props.defaultSwitched));
+      (nextProps.hasOwnProperty('defaultChecked') &&
+      (nextProps.defaultChecked !== this.props.defaultChecked));
 
     if (hasCheckedProp || hasToggledProp || hasNewDefaultProp) {
-      const switched = nextProps.checked || nextProps.toggled || nextProps.defaultSwitched;
+      const switched = nextProps.checked || nextProps.toggled || nextProps.defaultChecked;
 
       this.setState({
         switched: switched,
@@ -258,7 +258,6 @@ class EnhancedSwitch extends React.Component {
       labelStyle,
       labelPosition,
       onSwitch, // eslint-disable-line no-unused-vars
-      defaultSwitched,
       onBlur, // eslint-disable-line no-unused-vars
       onFocus, // eslint-disable-line no-unused-vars
       onMouseUp, // eslint-disable-line no-unused-vars
@@ -331,7 +330,6 @@ class EnhancedSwitch extends React.Component {
         style={prepareStyles(Object.assign(styles.input, inputStyle))}
         name={name}
         value={value}
-        defaultChecked={defaultSwitched}
         disabled={disabled}
         onBlur={this.handleBlur}
         onFocus={this.handleFocus}