fix: React 16.3 compatibility

Closes #57
gregberge · Apr 5, 2018 · abd7963 · abd7963
1 parent 96333ca
commit abd7963
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/src/loadable.js b/src/loadable.js
@@ -37,24 +37,29 @@ function loadable(
       return LoadableComponent.loadingPromise
     }
 
-    state = {
-      Component: LoadableComponent.Component,
-      error: null,
-      loading: true,
-    }
-
-    mounted = false
-
-    componentWillMount() {
-      if (typeof window === 'undefined' || this.state.Component !== null) return
-
-      LoadableComponent.load()
-        .then(Component => {
-          this.safeSetState({ Component, loading: false })
-        })
-        .catch(error => {
-          this.safeSetState({ error, loading: false })
-        })
+    constructor(props) {
+      super(props)
+      this.state = {
+        Component: LoadableComponent.Component,
+        error: null,
+        loading: true,
+      }
+      this.mounted = false
+      this.loadingPromise = null
+
+      if (
+        typeof window !== 'undefined' &&
+        this.state.Component === null &&
+        this.loadingPromise === null
+      ) {
+        this.loadingPromise = LoadableComponent.load()
+          .then(Component => {
+            this.safeSetState({ Component, loading: false })
+          })
+          .catch(error => {
+            this.safeSetState({ error, loading: false })
+          })
+      }
     }
 
     componentDidMount() {