Merge pull request #4359 from apollographql/stop-QueryManager-more-th…

…oroughly Prevent unhandled rejections by stopping QueryManager more thoroughly.
apollographql · Jan 22, 2019 · b37ef99 · b37ef99
2 parents f94cd30 + b3961b9
commit b37ef99
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/packages/apollo-client/src/core/QueryManager.ts b/packages/apollo-client/src/core/QueryManager.ts
@@ -113,6 +113,11 @@ export class QueryManager<TStore> {
    */
   public stop() {
     this.scheduler.stop();
+
+    this.queries.forEach((_info, queryId) => {
+      this.stopQueryNoBroadcast(queryId);
+    });
+
     this.fetchQueryRejectFns.forEach(reject => {
       reject(new Error('QueryManager stopped while query was in flight'));
     });
@@ -721,9 +726,14 @@ export class QueryManager<TStore> {
   }
 
   public stopQueryInStore(queryId: string) {
+    this.stopQueryInStoreNoBroadcast(queryId);
+    this.broadcastQueries();
+  }
+
+  private stopQueryInStoreNoBroadcast(queryId: string) {
+    this.scheduler.stopPollingQuery(queryId);
     this.queryStore.stopQuery(queryId);
     this.invalidate(true, queryId);
-    this.broadcastQueries();
   }
 
   public addQueryListener(queryId: string, listener: QueryListener) {
@@ -953,7 +963,12 @@ export class QueryManager<TStore> {
   }
 
   public stopQuery(queryId: string) {
-    this.stopQueryInStore(queryId);
+    this.stopQueryNoBroadcast(queryId);
+    this.broadcastQueries();
+  }
+
+  private stopQueryNoBroadcast(queryId: string) {
+    this.stopQueryInStoreNoBroadcast(queryId);
     this.removeQuery(queryId);
   }