Merge pull request #84 from nick-codes/fix-get-node-while-unmounted

loktar00 · web-flow · commit 72093a118e96 · 2017-02-15T17:12:07.000-05:00
Fix Issue #83: Issue with event firing on unmounted component.
diff --git a/src/LazyLoad.jsx b/src/LazyLoad.jsx
@@ -24,6 +24,7 @@ export default class LazyLoad extends Component {
   }
 
   componentDidMount() {
+    this._mounted = true;
     const eventNode = this.getEventNode();
 
     this.lazyLoadHandler();
@@ -47,6 +48,7 @@ export default class LazyLoad extends Component {
   }
 
   componentWillUnmount() {
+    this._mounted = false;
     if (this.lazyLoadHandler.cancel) {
       this.lazyLoadHandler.cancel();
     }
@@ -77,6 +79,9 @@ export default class LazyLoad extends Component {
   }
 
   lazyLoadHandler() {
+    if (!this._mounted) {
+      return;
+    }
     const offset = this.getOffset();
     const node = findDOMNode(this);
     const eventNode = this.getEventNode();

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ export default class LazyLoad extends Component {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`componentDidMount() {`
	`27`	`+ this._mounted = true;`
`27`	`28`	`const eventNode = this.getEventNode();`
`28`	`29`
`29`	`30`	`this.lazyLoadHandler();`
`@@ -47,6 +48,7 @@ export default class LazyLoad extends Component {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`componentWillUnmount() {`
	`51`	`+ this._mounted = false;`
`50`	`52`	`if (this.lazyLoadHandler.cancel) {`
`51`	`53`	`this.lazyLoadHandler.cancel();`
`52`	`54`	`}`
`@@ -77,6 +79,9 @@ export default class LazyLoad extends Component {`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`lazyLoadHandler() {`
	`82`	`+ if (!this._mounted) {`
	`83`	`+ return;`
	`84`	`+ }`
`80`	`85`	`const offset = this.getOffset();`
`81`	`86`	`const node = findDOMNode(this);`
`82`	`87`	`const eventNode = this.getEventNode();`