redux-form#4069 redux-form#4020 optimized init if needed initial valu…

…es usage
andrew-aladev · Jan 17, 2020 · 38a95a7 · 38a95a7
1 parent a980cac
commit 38a95a7
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/src/createReduxForm.js b/src/createReduxForm.js
@@ -341,22 +341,25 @@ const createReduxForm = (structure: Structure<*, *>) => {
             updateUnregisteredFields
           } = this.props
 
-          if (nextProps && nextProps.initialValues) {
-            const shouldReinitialize =
-              nextProps.initialized &&
-              enableReinitialize &&
-              !deepEqual(initialValues, nextProps.initialValues)
-            const shouldUpdateInitial =
-              !nextProps.initialized || shouldReinitialize
-
-            if (shouldUpdateInitial) {
-              const keepDirty = nextProps.initialized && keepDirtyOnReinitialize
-
-              initialize(nextProps.initialValues, keepDirty, {
-                keepValues: nextProps.keepValues,
-                lastInitialValues: initialValues,
-                updateUnregisteredFields: nextProps.updateUnregisteredFields
-              })
+          if (nextProps) {
+            if (nextProps.initialValues) {
+              const shouldReinitialize =
+                nextProps.initialized &&
+                enableReinitialize &&
+                !deepEqual(initialValues, nextProps.initialValues)
+              const shouldUpdateInitial =
+                !nextProps.initialized || shouldReinitialize
+
+              if (shouldUpdateInitial) {
+                const keepDirty =
+                  nextProps.initialized && keepDirtyOnReinitialize
+
+                initialize(nextProps.initialValues, keepDirty, {
+                  keepValues: nextProps.keepValues,
+                  lastInitialValues: initialValues,
+                  updateUnregisteredFields: nextProps.updateUnregisteredFields
+                })
+              }
             }
           } else if (initialValues) {
             const shouldUpdateInitial = !initialized || enableReinitialize