Merge pull request #70 from uttrasey/combine-field-errors-during-clone

Fix clone bug

src/helpers/__tests__/cloneChildren-test.js

@@ -112,6 +112,23 @@ describe('cloneChildren', () => {
         expect(warning).toBeCalledWith(false, 'Duplicate name "color" found. Duplicate fields will be ignored');
     });
 
+    it('combines the forms field errors with user specified field errors', () => {
+        const fieldErrors = {
+            color: ['form error']
+        }
+
+        const rule = require('../cloneChildren').createFormableRule([], fieldErrors);
+
+        const children = [
+            <Input name="color" type="text"
+                fieldErrors={['other error']} />
+        ];
+
+        const clonedInput = cloneChildren([rule], children);
+
+        expect(clonedInput.props.fieldErrors).toEqual(['other error', 'form error']);
+    });
+
     it('returns a single child (not an array of one) when cloning a single child', () => {
         const createFormableRule = require('../cloneChildren').createFormableRule;
         const rule = createFormableRule({})

src/helpers/cloneChildren.js

@@ -52,6 +52,17 @@ export function createErrorsRule(errors = [], fieldErrors = {}) {
     }
 }
 
+function combineListsIfLists(...lists) {
+    const combined = [];
+
+    lists.forEach(list => {
+        if (list && list.length) {
+            combined.push(...list);
+        }
+    });
+    return combined;
+}
+
 /*
  * Get extra properties for something we are going to weave our formable magic into.
  */
@@ -66,7 +77,7 @@ function getFormableComponentProperties(errors, fieldErrors, onSubmit, onChange)
             onChange: compose(onChange, child.props.onChange || identity),
             onSubmit: compose(onSubmit, child.props.onSubmit || identity),
             errors: errors,
-            fieldErrors: child.props.fieldErrors || fieldErrors[child.props.name]
+            fieldErrors: combineListsIfLists(child.props.fieldErrors, fieldErrors[child.props.name])
         };
     }
 }