Merge branch 'master' into etrepum-rerendering-gh225

# Conflicts:
#	test/field-component-spec.js

Author: davidkpiano

src/actions/model-actions.js

@@ -1,6 +1,5 @@
 import _get from '../utils/get';
 import endsWith from 'lodash/endsWith';
-import isEqual from 'lodash/isEqual';
 import identity from 'lodash/identity';
 import icepick from 'icepick';
 
@@ -34,9 +33,9 @@ const change = (model, value, options = {}) => {
   };
 };
 
-const xor = (model, item) => (dispatch, getState) => {
+const xor = (model, item, iteratee = (value) => value === item) => (dispatch, getState) => {
   const state = _get(getState(), model, []);
-  const stateWithoutItem = state.filter(stateItem => !isEqual(stateItem, item));
+  const stateWithoutItem = state.filter(stateItem => !iteratee(stateItem));
   const value = (state.length === stateWithoutItem.length) ? [...state, item] : stateWithoutItem;
 
   dispatch({

src/components/field-component.js

@@ -4,7 +4,6 @@ import connect from 'react-redux/lib/components/connect';
 
 import _get from '../utils/get';
 import identity from 'lodash/identity';
-import isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';
 
 import actions from '../actions';
@@ -30,7 +29,7 @@ function isChecked(props) {
   if (isMulti(props.model)) {
     return (props.modelValue || [])
       .filter((item) =>
-        isEqual(item, props.value))
+        item === props.value)
       .length;
   }
 
@@ -47,7 +46,7 @@ const controlPropsMap = {
   radio: (props) => ({
     ...props,
     name: props.model,
-    checked: isEqual(props.modelValue, props.value),
+    checked: props.modelValue === props.value,
     value: props.value,
   }),
   select: (props) => ({
@@ -115,9 +114,7 @@ function createFieldControlComponent(control, props, options) {
   }
 
   /* eslint-disable react/prop-types */
-  const {
-    mapProps = options.controlPropsMap[getControlType(control, options)],
-  } = props;
+  const mapProps = options.controlPropsMap[getControlType(control, options)];
 
   const controlProps = omit(props, ['children', 'className']);
 
@@ -213,7 +210,6 @@ function createFieldClass(customControlPropsMap = {}, defaultProps = {}) {
       PropTypes.func,
       PropTypes.object,
     ]),
-    mapProps: PropTypes.func,
     modelValue: PropTypes.any,
   };
 

src/components/form-component.js

@@ -53,7 +53,10 @@ class Form extends Component {
     } = this.props;
 
     if (!validators && !errors && (modelValue !== nextProps.modelValue)) {
-      dispatch(actions.setValidity(model, true));
+      if (!formValue.valid) {
+        dispatch(actions.setValidity(model, true));
+      }
+
       return;
     }
 

src/reducers/form-reducer.js

@@ -2,7 +2,7 @@ import _get from '../utils/get';
 import every from 'lodash/every';
 import icepick from 'icepick';
 import isBoolean from 'lodash/isBoolean';
-import isEqual from 'lodash/isEqual';
+import arraysEqual from '../utils/arrays-equal';
 import isPlainObject from 'lodash/isPlainObject';
 import map from 'lodash/map';
 import mapValues from '../utils/map-values';
@@ -127,7 +127,7 @@ function _createFormReducer(model, initialState) {
 
     const path = toPath(action.model);
 
-    if (!isEqual(path.slice(0, modelPath.length), modelPath)) {
+    if (!arraysEqual(path.slice(0, modelPath.length), modelPath)) {
       return state;
     }
 

src/reducers/model-reducer.js

@@ -1,6 +1,6 @@
 import _get from '../utils/get';
 import icepick from 'icepick';
-import isEqual from 'lodash/isEqual';
+import arraysEqual from '../utils/arrays-equal';
 import toPath from '../utils/to-path';
 
 import actionTypes from '../action-types';
@@ -20,7 +20,7 @@ function createModeler(getter = _get, setter = icepickSet, initialModelState = {
 
       const path = toPath(action.model);
 
-      if (!isEqual(path.slice(0, modelPath.length), modelPath)) {
+      if (!arraysEqual(path.slice(0, modelPath.length), modelPath)) {
         return state;
       }
 
@@ -36,7 +36,7 @@ function createModeler(getter = _get, setter = icepickSet, initialModelState = {
             return action.value;
           }
 
-          if (isEqual(getter(state, localPath), action.value)) {
+          if (getter(state, localPath) === action.value) {
             return state;
           }
 
@@ -47,7 +47,7 @@ function createModeler(getter = _get, setter = icepickSet, initialModelState = {
             return initialState;
           }
 
-          if (isEqual(getter(state, localPath), getter(initialState, localPath))) {
+          if (getter(state, localPath) === getter(initialState, localPath)) {
             return state;
           }
 

src/utils/arrays-equal.js

@@ -0,0 +1,5 @@
+export default function arraysEqual(firstArray, secondArray) {
+  return firstArray && secondArray
+    && firstArray.length === secondArray.length
+    && firstArray.every((item, index) => item === secondArray[index]);
+}

src/utils/sequence.js

@@ -2,7 +2,6 @@ import identity from 'lodash/identity';
 import capitalize from '../utils/capitalize';
 import mapValues from '../utils/map-values';
 import compose from 'redux/lib/compose';
-import isEqual from 'lodash/isEqual';
 import merge from '../utils/merge';
 import icepick from 'icepick';
 
@@ -33,7 +32,8 @@ const modelValueUpdaterMap = {
 
     if (isMulti(model)) {
       const valueWithItem = modelValue || [];
-      const valueWithoutItem = (valueWithItem || []).filter(item => !isEqual(item, eventValue));
+      const valueWithoutItem = (valueWithItem || [])
+        .filter(item => item !== eventValue);
       const value = (valueWithoutItem.length === valueWithItem.length)
         ? icepick.push(valueWithItem, eventValue)
         : valueWithoutItem;

test/model-actions-spec.js

@@ -111,7 +111,7 @@ describe('model actions', () => {
         },
         {
           init: { foo: ['primitive', { a: 'b' }] },
-          params: ['test.foo', { a: 'b' }],
+          params: ['test.foo', { a: 'b' }, (item) => item.a === 'b'],
           expected: { foo: ['primitive'] },
         },
       ],