Merge pull request #46 from mediamonks/develop

Update lifecycle

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediamonks/react-redux-component-init",
-  "version": "2.0.2",
+  "version": "2.0.0",
   "description": "A library to manage async component initialization in isomorphic React/Redux applications with server-side rendering",
   "main": "./lib/index.js",
   "scripts": {

src/actions/initComponent.js

@@ -74,7 +74,7 @@ export default (Component, initValues, prepareKey, { caller } = {}) => (dispatch
         // mounted on the client (after first render)
         initSelf !== INIT_SELF_NEVER;
       break;
-    case 'getDerivedStateFromProps':
+    case 'didUpdate':
       errorNotPrepared = false;
       shouldCallInitAction = !!initAction;
       shouldCallInitActionClient = !!initActionClient;

src/withInitAction.js

@@ -173,23 +173,27 @@ export default (p1, p2, p3) => {
           __componentInitState: { selfInitState },
         } = newProps;
         if (selfInitState) {
-          this.setState(() => ({
+          return {
             initializedOnce: true,
-          }));
+          };
         }
 
+        return null;
+      }
+
+      componentDidUpdate(prevProps) {
         if (initProps.length && reinitialize) {
           const {
             __componentInitState: { initValues },
             __initComponent,
-          } = this.props;
+          } = [prevProps];
           const {
             __componentInitState: { initValues: newInitValues, prepareKey },
-          } = newProps;
+          } = this.props;
 
           if (initValues !== newInitValues) {
             __initComponent(newInitValues, prepareKey, {
-              caller: 'getDerivedStateFromProps',
+              caller: 'didUpdate',
             }).catch(this.handleInitError);
           }
         }