Merge pull request #151 from brigade/unsettimeout

Clear timeout when unmounting
civiccc · Jan 17, 2017 · 1623971 · 1623971
2 parents 0cdb374 + 08c48b3
commit 1623971
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/waypoint.jsx b/src/waypoint.jsx
@@ -153,7 +153,7 @@ export default class Waypoint extends React.Component {
     // this._ref may occasionally not be set at this time. To help ensure that
     // this works smoothly, we want to delay the initial execution until the
     // next tick.
-    setTimeout(() => {
+    this.initialTimeout = setTimeout(() => {
       this._handleScroll(null);
     }, 0);
   }
@@ -174,6 +174,8 @@ export default class Waypoint extends React.Component {
 
     removeEventListener(this.scrollEventListenerHandle);
     removeEventListener(this.resizeEventListenerHandle);
+
+    clearTimeout(this.initialTimeout);
   }
 
   /**