Interleave the snapshot variable

enzymejs · Jul 4, 2018 · b508490 · b508490
1 parent f92e09d
commit b508490
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -339,22 +339,20 @@ class ShallowWrapper {
             instance
           ) {
             const lifecycles = getAdapterLifecycles(adapter);
-            // getSnapshotBeforeUpdate
-            let snapshot;
-            if (
-              lifecycles.getSnapshotBeforeUpdate
-              && typeof instance.getSnapshotBeforeUpdate === 'function'
-            ) {
-              snapshot = instance.getSnapshotBeforeUpdate(prevProps, state);
-            }
-            // componentDidUpdate
-            if (
+
+            if (lifecycles.getSnapshotBeforeUpdate) {
+              let snapshot;
+              if (typeof instance.getSnapshotBeforeUpdate === 'function') {
+                snapshot = instance.getSnapshotBeforeUpdate(prevProps, state);
+              }
+              if (typeof instance.componentDidUpdate === 'function') {
+                instance.componentDidUpdate(prevProps, state, snapshot);
+              }
+            } else if (
               lifecycles.componentDidUpdate &&
               typeof instance.componentDidUpdate === 'function'
             ) {
-              if (lifecycles.getSnapshotBeforeUpdate) {
-                instance.componentDidUpdate(prevProps, state, snapshot);
-              } else if (lifecycles.componentDidUpdate.prevContext) {
+              if (lifecycles.componentDidUpdate.prevContext) {
                 instance.componentDidUpdate(prevProps, state, prevContext);
               } else {
                 instance.componentDidUpdate(prevProps, state);