Support getSnapshotBeforeUpdate

enzymejs · Jul 2, 2018 · 312df6b · 312df6b
1 parent 1558edb
commit 312df6b
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -288,27 +288,24 @@ class ShallowWrapper {
           if (
             shouldRender &&
             !this[OPTIONS].disableLifecycleMethods &&
-            instance &&
-            typeof instance.componentDidUpdate === 'function'
+            instance
           ) {
+            // getSnapshotBeforeUpdate
+            let snapshot;
             if (
-              !this[OPTIONS].disableLifecycleMethods &&
-              instance
+              adapter.options.supportGetSnapshotBeforeUpdate
+              && typeof instance.getSnapshotBeforeUpdate === 'function'
             ) {
-              if (
-                adapter.options.supportGetSnapshotBeforeUpdate
-                && typeof instance.getSnapshotBeforeUpdate === 'function'
-              ) {
-                const snapshot = instance.getSnapshotBeforeUpdate(prevProps, state);
-                if (typeof instance.componentDidUpdate === 'function') {
-                  instance.componentDidUpdate(prevProps, state, snapshot);
-                }
-              } else if (typeof instance.componentDidUpdate === 'function') {
-                if (adapter.options.supportPrevContextArgumentOfComponentDidUpdate) {
-                  instance.componentDidUpdate(prevProps, state, prevContext);
-                } else {
-                  instance.componentDidUpdate(prevProps, state);
-                }
+              snapshot = instance.getSnapshotBeforeUpdate(prevProps, state);
+            }
+            // componentDidUpdate
+            if (typeof instance.componentDidUpdate === 'function') {
+              if (adapter.options.supportGetSnapshotBeforeUpdate) {
+                instance.componentDidUpdate(prevProps, state, snapshot);
+              } else if (adapter.options.supportPrevContextArgumentOfComponentDidUpdate) {
+                instance.componentDidUpdate(prevProps, state, prevContext);
+              } else {
+                instance.componentDidUpdate(prevProps, state);
               }
             }
           // If it doesn't need to rerender, update only its props.