fix(core): added in timer and interval id checks before clearing (#3762)

TanStack · Jul 15, 2022 · 5d99f7e · 5d99f7e · vercel · Jul 15, 2022
1 parent 3118b7f
commit 5d99f7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/core/query.ts b/src/core/query.ts
@@ -211,8 +211,10 @@ export class Query<
   }
 
   private clearGcTimeout() {
-    clearTimeout(this.gcTimeout)
-    this.gcTimeout = undefined
+    if (this.gcTimeout) {
+      clearTimeout(this.gcTimeout)
+      this.gcTimeout = undefined
+    }
   }
 
   private optionalRemove() {

diff --git a/src/core/queryObserver.ts b/src/core/queryObserver.ts
@@ -433,13 +433,17 @@ export class QueryObserver<
   }
 
   private clearStaleTimeout(): void {
-    clearTimeout(this.staleTimeoutId)
-    this.staleTimeoutId = undefined
+    if (this.staleTimeoutId) {
+      clearTimeout(this.staleTimeoutId)
+      this.staleTimeoutId = undefined
+    }
   }
 
   private clearRefetchInterval(): void {
-    clearInterval(this.refetchIntervalId)
-    this.refetchIntervalId = undefined
+    if (this.refetchIntervalId) {
+      clearInterval(this.refetchIntervalId)
+      this.refetchIntervalId = undefined
+    }
   }
 
   protected createResult(