From 6da9882c6cdb86d88bfbc0bd2edde392656d9188 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Fri, 2 Mar 2018 18:44:33 +0100
Subject: [PATCH] fix(scroll): clearInterval just to be safe

---
 packages/core/src/components/scroll/scroll.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/core/src/components/scroll/scroll.tsx b/packages/core/src/components/scroll/scroll.tsx
index 9b5dfa44d2..53aec612c7 100644
--- a/packages/core/src/components/scroll/scroll.tsx
+++ b/packages/core/src/components/scroll/scroll.tsx
@@ -85,6 +85,12 @@ export class Scroll {
     }
   }
 
+  componentDidUnload() {
+    if (this.watchDog) {
+      clearInterval(this.watchDog);
+    }
+  }
+
   @Listen('scroll', { passive: true })
   onScroll(ev: UIEvent) {
     const timeStamp = Date.now();
@@ -220,6 +226,9 @@ export class Scroll {
       isScrolling: true
     });
 
+    if (this.watchDog) {
+      clearInterval(this.watchDog);
+    }
     // watchdog
     this.watchDog = setInterval(() => {
       if (this.lastScroll < Date.now() - 120) {