Removing online offline event Handlers in componentWillUnmount

harshitkumar31 · Aug 11, 2017 · 4fae889 · 4fae889
1 parent 4bfe051
commit 4fae889
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/asyncDataLoader.js b/src/asyncDataLoader.js
@@ -80,21 +80,26 @@ const AsyncDataLoader = (WrappedComponent, { componentName, refreshInterval, wra
      * Fetch is invoked here to ensure server side rendering
      * If refreshInterval is specified, we invoke setInterval.
      */
+    onOnlineEvent = (e) => {
+      this.startTimer = setInterval(this.fetch, refreshInterval);
+    }
+
+    onOfflineEvent = (e) => {
+      clearInterval(this.startTimer);
+    }
+
     componentWillMount() {
       this.fetch();
     }
     componentDidMount() {
       if (refreshInterval) {
         this.startTimer = setInterval(this.fetch, refreshInterval);
         // Clear timer if browser goes offline
-        window.addEventListener('offline', (e) => {
-          clearInterval(this.startTimer);
-        });
+        window.addEventListener('offline', this.onOfflineEvent);
+
+        // Restart timer if browser goes online
+        window.addEventListener('online', this.onOnlineEvent);
 
-      // Restart timer if browser goes online
-        window.addEventListener('online', (e) => {
-          this.startTimer = setInterval(this.fetch, refreshInterval);
-        });
       }
     }
     /**
@@ -106,6 +111,8 @@ const AsyncDataLoader = (WrappedComponent, { componentName, refreshInterval, wra
       if (this.startTimer) {
         clearInterval(this.startTimer);
       }
+      window.removeEventListener('online', this.onOnlineEvent);
+      window.removeEventListener('offline', this.onOfflineEvent);
       const obj = {};
       obj[componentName] = {
         loaded: LOADED_FALSE,