[fixed] guard against async setState

pheeno · Feb 16, 2016 · 8805757 · 8805757
1 parent bd11101
commit 8805757
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Popup.jsx b/src/Popup.jsx
@@ -169,7 +169,7 @@ module.exports = React.createClass({
         , duration = this.props.duration;
 
       this.animate(el, offset, duration, 'ease', () =>
-        this.setState({ status: CLOSED }, () => {
+        this.safeSetState({ status: CLOSED }, () => {
           this.props.onClose()
         })
       )

diff --git a/src/mixins/FocusMixin.js b/src/mixins/FocusMixin.js
@@ -18,7 +18,8 @@ export default function FocusMixin({ willHandle, didHandle }) {
 
         if (focused !== inst.state.focused) {
           notify(handler, event)
-          inst.setState({ focused })
+          if (inst.isMounted())
+            inst.setState({ focused })
         }
       })
     })