Fix lazy option on withInitAction

Prevent 'not prepared' error on lazy components Move initComponent call for lazy components to componentDidMount
mediamonks · May 13, 2017 · cf442ba · cf442ba
1 parent 1e955bc
commit cf442ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/actions/initComponent.js b/src/actions/initComponent.js
@@ -42,7 +42,7 @@ export default (
     componentId,
     initProps,
     initAction,
-    options: { onError, getInitState, initSelf },
+    options: { onError, getInitState, initSelf, lazy },
   } = Component.initConfig;
 
   const initState = getInitState(getState());
@@ -52,7 +52,7 @@ export default (
   const { mode, prepared } = initState;
 
   if (
-    ((mode === MODE_INIT_SELF) && (initSelf !== INIT_SELF_NEVER)) ||
+    (((mode === MODE_INIT_SELF) || lazy) && (initSelf !== INIT_SELF_NEVER)) ||
     (isPrepare && (typeof prepared[prepareKey] === 'undefined'))
   ) {
     const initPropsObj = propNameValuesToObject(initProps, initValues);

diff --git a/src/withInitAction.js b/src/withInitAction.js
@@ -110,7 +110,15 @@ export default (p1, p2, p3) => {
       componentWillMount() {
         const { initValues, prepareKey } = this.props.__componentInitState;
 
-        if (initSelf !== INIT_SELF_NEVER) {
+        if (initSelf !== INIT_SELF_NEVER && !lazy) {
+          this.props.__initComponent(initValues, prepareKey).catch(this.handleInitError);
+        }
+      }
+
+      componentDidMount() {
+        if (lazy) {
+          const { initValues, prepareKey } = this.props.__componentInitState;
+
           this.props.__initComponent(initValues, prepareKey).catch(this.handleInitError);
         }
       }