Adding intent for setting model value to newest load value after reset. Fixes #533

Author: davidkpiano

src/components/control-component.js

@@ -346,6 +346,7 @@ function createControlClass(customControlPropsMap = {}, s = defaultStrategy) {
     handleIntents() {
       const {
         model,
+        modelValue,
         fieldValue,
         fieldValue: { intents },
         controlProps,
@@ -383,6 +384,14 @@ function createControlClass(customControlPropsMap = {}, s = defaultStrategy) {
               this.validate();
             }
             return;
+
+          case 'load':
+            if (!shallowEqual(modelValue, intent.value)) {
+              dispatch(actions.clearIntents(model, intent));
+              dispatch(actions.load(model, intent.value));
+            }
+            return;
+
           default:
             return;
         }

src/reducers/form-actions-reducer.js

@@ -23,7 +23,10 @@ const resetFieldState = (field, key) => {
     return i.assign(initialFieldState, {
       value: field.initialValue,
       model: field.model,
-      intents: [{ type: 'validate' }],
+      intents: [
+        { type: 'validate' },
+        { type: 'load', value: field.initialValue },
+      ],
     });
   }
 
@@ -32,7 +35,10 @@ const resetFieldState = (field, key) => {
   return i.assign(initialFieldState, {
     value: field.initialValue,
     model: field.model,
-    intents: [{ type: 'validate' }],
+    intents: [
+      { type: 'validate' },
+      { type: 'load', value: field.initialValue },
+    ],
   });
 };
 

test/control-component-spec.js

@@ -915,6 +915,30 @@ Object.keys(testContexts).forEach((testKey) => {
       });
     });
 
+    describe('initial value after reset', () => {
+      const initialState = getInitialState({ foo: '' });
+      const reducer = formReducer('test');
+      const store = testCreateStore({
+        testForm: reducer,
+        test: modelReducer('test', initialState),
+      });
+
+      TestUtils.renderIntoDocument(
+        <Provider store={store}>
+          <Control.text
+            model="test.foo"
+          />
+        </Provider>
+      );
+
+      it('should reset the control to the last loaded value', () => {
+        store.dispatch(actions.load('test.foo', 'new foo'));
+        store.dispatch(actions.reset('test.foo'));
+
+        assert.equal(get(store.getState().test, 'foo'), 'new foo');
+      });
+    });
+
     describe('errors property', () => {
       const reducer = formReducer('test');