FormReducer now handles model at deep state path

Author: Mike Lin

dist/index.js

@@ -43,6 +43,10 @@ var _cloneDeep = require('lodash/cloneDeep');
 
 var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
 
+var _isEqual = require('lodash/isEqual');
+
+var _isEqual2 = _interopRequireDefault(_isEqual);
+
 var _actionTypes = require('../action-types');
 
 var actionTypes = _interopRequireWildcard(_actionTypes);
@@ -100,12 +104,11 @@ function createFormReducer(model) {
     var action = arguments[1];
 
     var path = (0, _toPath2.default)(action.model);
-
-    if (path[0] !== model) {
+    var modelPath = (0, _toPath2.default)(model);
+    if (!(0, _isEqual2.default)(path.slice(0, modelPath.length), modelPath)) {
       return state;
     }
-
-    var localPath = path.slice(1);
+    var localPath = path.slice(modelPath.length);
 
     var form = (0, _cloneDeep2.default)(state);
 

lib/reducers/form-reducer.js

@@ -7,6 +7,7 @@ import isBoolean from 'lodash/isBoolean';
 import mapValues from 'lodash/mapValues';
 import every from 'lodash/every';
 import cloneDeep from 'lodash/cloneDeep';
+import isEqual from 'lodash/isEqual';
 
 import * as actionTypes from '../action-types';
 
@@ -65,12 +66,11 @@ function createInitialFormState(model) {
 function createFormReducer(model) {
   return (state = createInitialFormState(model), action) => {
     let path = toPath(action.model);
-
-    if (path[0] !== model) {
-      return state;
+    let modelPath = toPath(model);
+    if (!isEqual(path.slice(0, modelPath.length), modelPath)) {
+        return state;
     }
-
-    let localPath = path.slice(1);
+    let localPath = path.slice(modelPath.length);
 
     let form = cloneDeep(state);
 

src/reducers/form-reducer.js

@@ -43,4 +43,14 @@ describe('createFormReducer()', () => {
       assert.isObject(getField(actual, 'foo').errors);
     });
   });
+
+  it('should be able to handle model at deep state path', () => {
+    const reducer = createFormReducer('forms.test');
+    let actual = reducer(undefined, actions.focus('forms.test.foo'));
+    assert.deepEqual(actual.fields.foo, {
+      ...initialFieldState,
+      focus: true,
+      blur: false
+    });
+  });  
 });

test/form-reducer-spec.js

@@ -79,4 +79,14 @@ describe('createModelReducer()', () => {
       shallowReducer(undefined, actions.change('test.foo.bar[1]', 'two')),
       { original: 'untouched', foo: { bar: [1, 'two', 3] } });
   });
+  
+  it('should handle model at deep state path', () => {
+    const reducer = createModelReducer('forms.test');
+    assert.deepEqual(
+      reducer(undefined, actions.change('forms.test.foo', 'new')),
+      { foo: 'new' }
+    );
+
+  })
+
 });