fix($error): error component not shown with dynamic components after …

…client side change 71
faceyspacey · Feb 27, 2018 · 1104e56 · 1104e56
1 parent 66915eb
commit 1104e56
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/index.js b/src/index.js
@@ -197,6 +197,7 @@ export default function universal<Props: Props>(
     ) => {
       if (!this._mounted) return
       if (!state.error) state.error = null
+
       this.handleAfter(state, isMount, isSync, isServer)
     }
 
@@ -247,13 +248,13 @@ export default function universal<Props: Props>(
       else if (userError) {
         return createElement(Err, { ...props, error: userError })
       }
+      else if (error) {
+        return createElement(Err, { ...props, error })
+      }
       else if (Component) {
         // primary usage (for async import loading + errors):
         return createElement(Component, props)
       }
-      else if (error) {
-        return createElement(Err, { ...props, error })
-      }
 
       return createElement(Loading, props)
     }