Fix componentDidUpdate no longer receives prevContext on React v16

enzymejs · Sep 26, 2017 · 88d9c76 · 88d9c76
1 parent 8cf9661
commit 88d9c76
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js b/packages/enzyme-adapter-react-13/src/ReactThirteenAdapter.js
@@ -144,6 +144,7 @@ class ReactThirteenAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
+      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js b/packages/enzyme-adapter-react-14/src/ReactFourteenAdapter.js
@@ -116,6 +116,7 @@ class ReactFifteenAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
+      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js b/packages/enzyme-adapter-react-15.4/src/ReactFifteenFourAdapter.js
@@ -146,6 +146,7 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
+      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js b/packages/enzyme-adapter-react-15/src/ReactFifteenAdapter.js
@@ -146,6 +146,7 @@ class ReactFifteenAdapter extends EnzymeAdapter {
     let isDOM = false;
     let cachedNode = null;
     return {
+      supportPrevContextArgumentOfComponentDidUpdate: true,
       render(el, context) {
         cachedNode = el;
         /* eslint consistent-return: 0 */

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -3231,7 +3231,7 @@ describe('shallow', () => {
               'componentDidUpdate',
               { foo: 'bar' }, { foo: 'baz' },
               { foo: 'state' }, { foo: 'state' },
-              { foo: 'context' }, // this will be gone in 16
+              REACT16 ? undefined : { foo: 'context' },
             ],
             [
               'componentWillReceiveProps',
@@ -3257,7 +3257,7 @@ describe('shallow', () => {
               'componentDidUpdate',
               { foo: 'baz' }, { foo: 'bax' },
               { foo: 'state' }, { foo: 'state' },
-              { foo: 'context' },
+              REACT16 ? undefined : { foo: 'context' },
             ],
           ],
         );
@@ -3440,7 +3440,6 @@ describe('shallow', () => {
     });
 
     context('updating state', () => {
-      // NOTE: There is a bug in react 16 shallow renderer where prevContext is not passed
       it('should call shouldComponentUpdate, componentWillUpdate and componentDidUpdate', () => {
         const spy = sinon.spy();
 
@@ -3501,7 +3500,7 @@ describe('shallow', () => {
             'componentDidUpdate',
             { foo: 'props' }, { foo: 'props' },
             { foo: 'bar' }, { foo: 'baz' },
-            { foo: 'context' },
+            REACT16 ? undefined : { foo: 'context' },
           ],
         ]);
       });
@@ -3661,7 +3660,7 @@ describe('shallow', () => {
             'componentDidUpdate',
             { foo: 'props' }, { foo: 'props' },
             { foo: 'state' }, { foo: 'state' },
-            { foo: 'bar' },
+            REACT16 ? undefined : { foo: 'bar' },
           ],
         ]);
       });

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -311,7 +311,11 @@ class ShallowWrapper {
               instance &&
               typeof instance.componentDidUpdate === 'function'
             ) {
-              instance.componentDidUpdate(prevProps, state, prevContext);
+              if (this[RENDERER].supportPrevContextArgumentOfComponentDidUpdate) {
+                instance.componentDidUpdate(prevProps, state, prevContext);
+              } else {
+                instance.componentDidUpdate(prevProps, state);
+              }
             }
             this.update();
           // If it doesn't need to rerender, update only its props.