Merge pull request #689 from liorbrauer/prevent-unmounted-setstate

Prevent calling setState on an unmounted WindowScroller component
bvaughn · Jun 10, 2017 · 727af33 · 727af33
2 parents efa0793 + cbbacc2
commit 727af33
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/source/WindowScroller/WindowScroller.js b/source/WindowScroller/WindowScroller.js
@@ -88,6 +88,8 @@ export default class WindowScroller extends PureComponent {
     registerScrollListener(this, scrollElement)
 
     window.addEventListener('resize', this._onResize, false)
+
+    this._isMounted = true
   }
 
   componentWillReceiveProps (nextProps) {
@@ -106,6 +108,8 @@ export default class WindowScroller extends PureComponent {
     unregisterScrollListener(this, this.props.scrollElement || window)
 
     window.removeEventListener('resize', this._onResize, false)
+
+    this._isMounted = false
   }
 
   render () {
@@ -127,6 +131,8 @@ export default class WindowScroller extends PureComponent {
 
   // Referenced by utils/onScroll
   __handleWindowScrollEvent (event) {
+    if (!this._isMounted) return
+
     const { onScroll } = this.props
 
     const scrollElement = this.props.scrollElement || window