Only return cached data if not expired, adjust handleSetEnabled logic

rainbow-me · Jan 4, 2025 · e838acd · e838acd
1 parent ec8eb14
commit e838acd
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/state/internal/createQueryStore.ts b/src/state/internal/createQueryStore.ts
@@ -740,7 +740,9 @@ export function createQueryStore<
       getData(params?: TParams) {
         if (disableCache) return null;
         const currentQueryKey = params ? getQueryKey(params) : get().queryKey;
-        return get().queryCache[currentQueryKey]?.data ?? null;
+        const cacheEntry = get().queryCache[currentQueryKey];
+        const isExpired = !!cacheEntry?.lastFetchedAt && Date.now() - cacheEntry.lastFetchedAt > cacheTime;
+        return isExpired ? null : cacheEntry?.data ?? null;
       },
 
       getStatus() {
@@ -802,10 +804,8 @@ export function createQueryStore<
           if (state.enabled) {
             const currentParams = getCurrentResolvedParams();
             const currentKey = state.queryKey;
-            if (currentKey !== lastFetchKey) {
-              state.fetch(currentParams, { force: true });
-            } else if (!state.queryCache[currentKey] || state.isStale()) {
-              state.fetch();
+            if (currentKey !== lastFetchKey || !state.queryCache[currentKey] || state.isStale()) {
+              state.fetch(currentParams, undefined);
             } else {
               scheduleNextFetch(currentParams, undefined);
             }