Do not pass defaultValue into components rendered in <Control>. Fixes #630

Author: davidkpiano

src/components/control-component.js

@@ -61,6 +61,7 @@ const propTypes = {
   ]).isRequired,
   modelValue: PropTypes.any,
   viewValue: PropTypes.any,
+  defaultValue: PropTypes.any,
   control: PropTypes.any,
   onLoad: PropTypes.func,
   onSubmit: PropTypes.func,
@@ -463,6 +464,8 @@ function createControlClass(s = defaultStrategy) {
         defaultValue = controlProps.defaultValue;
       } else if (controlProps.hasOwnProperty('defaultChecked')) {
         defaultValue = controlProps.defaultChecked;
+      } else if (this.props.hasOwnProperty('defaultValue')) {
+        defaultValue = this.props.defaultValue;
       }
 
       const loadActions = [this.getValidateAction(defaultValue)];

src/constants/control-props-map.js

@@ -32,9 +32,12 @@ const standardPropsMap = {
 
 const textPropsMap = {
   ...standardPropsMap,
-  value: (props) => ((!props.defaultValue && !props.hasOwnProperty('value'))
-    ? getTextValue(props.viewValue)
-    : props.value),
+  // the value passed into the control is either the original control's
+  // value prop (if the control is controlled) or the value controlled by
+  // <Control>.
+  value: (props) => (props.hasOwnProperty('value')
+    ? props.value
+    : getTextValue(props.viewValue)),
 };
 
 const getModelValue = ({ modelValue }) => modelValue;