Handlers should not call setState() after being unmounted (related to #…

…307)
react-dnd · Feb 14, 2016 · 237ba41 · 237ba41
1 parent 1e6f3e3
commit 237ba41
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/decorateHandler.js b/src/decorateHandler.js
@@ -68,6 +68,10 @@ export default function decorateHandler({
       this.state = this.getCurrentState();
     }
 
+    componentDidMount() {
+      this.isCurrentlyMounted = true;
+    }
+
     componentWillReceiveProps(nextProps) {
       if (!arePropsEqual(nextProps, this.props)) {
         this.receiveProps(nextProps);
@@ -77,6 +81,7 @@ export default function decorateHandler({
 
     componentWillUnmount() {
       this.disposable.dispose();
+      this.isCurrentlyMounted = false;
     }
 
     receiveProps(props) {
@@ -126,6 +131,10 @@ export default function decorateHandler({
     }
 
     handleChange() {
+      if (!this.isCurrentlyMounted) {
+        return;
+      }
+
       const nextState = this.getCurrentState();
       if (!shallowEqual(nextState, this.state)) {
         this.setState(nextState);