Clear form cache on componentDidMount instead of mapStateToProps (d…

…avidkpiano#1218)
andrewmtam · Mar 25, 2020 · 3f235c8 · 3f235c8
1 parent 877b08a
commit 3f235c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/components/form-component.js b/src/components/form-component.js
@@ -98,6 +98,7 @@ function createFormClass(s = defaultStrategy) {
       if (this.props.getDispatch) {
         this.props.getDispatch(this.props.dispatch);
       }
+      clearGetFormCacheForModel(this.props.model);
     }
 
     UNSAFE_componentWillReceiveProps(nextProps) {
@@ -409,7 +410,6 @@ function createFormClass(s = defaultStrategy) {
 
   function mapStateToProps(state, { model }) {
     const modelString = getModel(model, state);
-    clearGetFormCacheForModel(modelString);
     const form = s.getForm(state, modelString);
 
     invariant(form,

diff --git a/test/form-component-spec.js b/test/form-component-spec.js
@@ -11,6 +11,7 @@ import sinon from 'sinon';
 
 import isValid from '../src/form/is-valid';
 import { defaultTestContexts, testCreateStore, testRender } from './utils';
+import { clearGetFormCache } from '../src/utils/get-form';
 
 import {
   Form as _Form,
@@ -69,6 +70,10 @@ Object.keys(testContexts).forEach((testKey) => {
   const combineForms = testContext.combineForms;
 
   describe(`<Form> component (${testKey} context)`, () => {
+    beforeEach(() => {
+      clearGetFormCache();
+    });
+
     describe('wraps component if specified', () => {
       const store = testCreateStore({
         testForm: formReducer('test', object),