Fixing async validity merging issues. Fixes #834

Author: davidkpiano

src/components/control-component.js

@@ -7,7 +7,7 @@ import shallowEqual from '../utils/shallow-equal';
 import _get from '../utils/get';
 import merge from '../utils/merge';
 import mapValues from '../utils/map-values';
-import isPlainObject from '../utils/is-plain-object';
+import isPlainObject, { isObjectLike } from '../utils/is-plain-object';
 import i from 'icepick';
 import omit from '../utils/omit';
 import actionTypes from '../action-types';
@@ -36,7 +36,7 @@ const disallowedProps = ['changeAction', 'getFieldFromState', 'store'];
 
 function mergeOrSetErrors(model, errors, options) {
   return actions.setErrors(model, errors, {
-    merge: isPlainObject(errors),
+    merge: isObjectLike(errors),
     ...options,
   });
 }

src/utils/is-plain-object.js

@@ -1,6 +1,10 @@
 // Adapted from https://github.com/jonschlinkert/is-plain-object
+export function isObjectLike(val) {
+  return val != null && typeof val === 'object';
+}
+
 function isObject(val) {
-  return val != null && typeof val === 'object' && Array.isArray(val) === false;
+  return isObjectLike(val) && Array.isArray(val) === false;
 }
 
 function isObjectObject(o) {

src/utils/merge-validity.js

@@ -1,11 +1,11 @@
-import isPlainObject from './is-plain-object';
-import merge from './merge';
+import { isObjectLike } from './is-plain-object';
+import { merge } from 'icepick';
 
 export default function mergeValidity(fieldValidity, actionValidity) {
-  if (!isPlainObject(fieldValidity) || !isPlainObject(actionValidity)) {
+  if (!isObjectLike(fieldValidity) || !isObjectLike(actionValidity)) {
     // can't merge string/boolean validity with keyed validity
     return actionValidity;
   }
 
-  return merge({ ...fieldValidity }, actionValidity);
+  return merge(fieldValidity, actionValidity);
 }

test/form-reducer-actions-spec.js

@@ -425,6 +425,36 @@ describe('formReducer() (V1)', () => {
           validated: true,
         },
       },
+      {
+        label: 'merging errors from array',
+        action: actions.setErrors,
+        model: 'user',
+        args: [{ from: 'object' }, { merge: true }],
+        initialState: {
+          $form: {
+            ...initialFieldState,
+            errors: ['array'],
+          },
+        },
+        expectedForm: {
+          errors: { 0: 'array', from: 'object' },
+        },
+      },
+      {
+        label: 'merging errors from object',
+        action: actions.setErrors,
+        model: 'user',
+        args: [['array'], { merge: true }],
+        initialState: {
+          $form: {
+            ...initialFieldState,
+            errors: { from: 'object' },
+          },
+        },
+        expectedForm: {
+          errors: { 0: 'array', from: 'object' },
+        },
+      },
     ],
     [actionTypes.SET_FIELDS_VALIDITY]: [
       {