Fix text fields cleared on every render

src/components/Form/TextFieldGroup.js

@@ -24,22 +24,17 @@ function TextFieldGroup(props) {
   );
   const fieldLabel = label || capitalize(unpackedName.pop());
 
-  const LabelWrapper = layout
-    ? (props) => <Col {...layout.labelCol}> {props.children}</Col>
-    : Fragment;
-  const FieldWrapper = layout
-    ? (props) => <Col {...layout.fieldCol}> {props.children}</Col>
-    : Fragment;
+  const Wrapper = layout ? Col : Fragment;
 
   return (
     <FormGroup controlId={controlId}>
-      <LabelWrapper>
+      <Wrapper {...(layout && layout.labelCol)}>
         <ControlLabel>
           {fieldLabel}
           {registerOptions.required && <RequiredStar />}
         </ControlLabel>
-      </LabelWrapper>
-      <FieldWrapper>
+      </Wrapper>
+      <Wrapper {...(layout && layout.fieldCol)}>
         <FormControl
           type={type}
           name={name}
@@ -48,7 +43,7 @@ function TextFieldGroup(props) {
           {...controlProps}
         />
         {error && <FieldAlert fieldLabel={fieldLabel} error={error} />}
-      </FieldWrapper>
+      </Wrapper>
     </FormGroup>
   );
 }