fix: ensure that component is mounted before calling setState (greg…

…berge#184) Closes gregberge#180
fivethreeo · Dec 11, 2018 · 77e7d24 · 77e7d24
1 parent 7b62559
commit 77e7d24
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/createLoadable.js b/src/createLoadable.js
@@ -59,13 +59,25 @@ function createLoadable({ resolve = identity, render, onLoad }) {
       }
 
       componentDidMount() {
+        this.mounted = true
+
         if (this.state.loading) {
           this.loadAsync()
         } else if (!this.state.error) {
           this.triggerOnLoad()
         }
       }
 
+      componentWillUnmount() {
+        this.mounted = false
+      }
+
+      safeSetState(nextState, callback) {
+        if (this.mounted) {
+          this.setState(nextState, callback)
+        }
+      }
+
       triggerOnLoad() {
         if (onLoad) {
           setTimeout(() => {
@@ -93,7 +105,7 @@ function createLoadable({ resolve = identity, render, onLoad }) {
           ctor
             .requireAsync(this.props)
             .then(loadedModule => {
-              this.setState(
+              this.safeSetState(
                 {
                   result: resolve(loadedModule, { Loadable }),
                   loading: false,
@@ -102,7 +114,7 @@ function createLoadable({ resolve = identity, render, onLoad }) {
               )
             })
             .catch(error => {
-              this.setState({ error, loading: false })
+              this.safeSetState({ error, loading: false })
             })
 
         return this.promise