fix: Fix QuerySubscription reuse (#539)

relay-tools · Jul 24, 2020 · e6a6d16 · e6a6d16
1 parent e4df12b
commit e6a6d16
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Resolver.js b/src/Resolver.js
@@ -127,6 +127,9 @@ export default class Resolver {
       }
 
       const variables = routeVariables[i];
+      const cacheConfig = cacheConfigs[i];
+      const fetchPolicy = fetchPolicies[i];
+
       const lastQuerySubscription = this.lastQuerySubscriptions[i];
 
       // Match the logic in <QueryRenderer> for not refetching.
@@ -136,15 +139,19 @@ export default class Resolver {
         isEqual(lastQuerySubscription.variables, variables)
       ) {
         this.lastQuerySubscriptions[i] = null;
+
+        lastQuerySubscription.cacheConfig = cacheConfig;
+        lastQuerySubscription.fetchPolicy = fetchPolicy;
+
         return lastQuerySubscription;
       }
 
       return new QuerySubscription({
         environment: this.environment,
         query,
         variables,
-        cacheConfig: cacheConfigs[i],
-        fetchPolicy: fetchPolicies[i],
+        cacheConfig,
+        fetchPolicy,
       });
     });