@tanstack/react-query 4.14.3 → 4.14.6

package/build/umd/index.development.js

@@ -826,14 +826,16 @@
       this.queryHash = config.queryHash;
       this.initialState = config.state || getDefaultState$1(this.options);
       this.state = this.initialState;
-      this.meta = config.meta;
+    }
+
+    get meta() {
+      return this.options.meta;
     }
 
     setOptions(options) {
       this.options = { ...this.defaultOptions,
         ...options
       };
-      this.meta = options == null ? void 0 : options.meta;
       this.updateCacheTime(this.options.cacheTime);
     }
 
@@ -1063,8 +1065,7 @@
         options: this.options,
         queryKey: this.queryKey,
         state: this.state,
-        fetchFn,
-        meta: this.meta
+        fetchFn
       };
       addSignalProperty(context);
       (_this$options$behavio = this.options.behavior) == null ? void 0 : _this$options$behavio.onFetch(context); // Store state in case the current fetch needs to be reverted
@@ -1298,8 +1299,7 @@
           queryHash,
           options: client.defaultQueryOptions(options),
           state,
-          defaultOptions: client.getQueryDefaults(queryKey),
-          meta: options.meta
+          defaultOptions: client.getQueryDefaults(queryKey)
         });
         this.add(query);
       }
@@ -1405,11 +1405,14 @@
       this.logger = config.logger || defaultLogger;
       this.observers = [];
       this.state = config.state || getDefaultState();
-      this.meta = config.meta;
       this.updateCacheTime(this.options.cacheTime);
       this.scheduleGc();
     }
 
+    get meta() {
+      return this.options.meta;
+    }
+
     setState(state) {
       this.dispatch({
         type: 'setState',
@@ -1654,8 +1657,7 @@
         mutationId: ++this.mutationId,
         options: client.defaultMutationOptions(options),
         state,
-        defaultOptions: options.mutationKey ? client.getMutationDefaults(options.mutationKey) : undefined,
-        meta: options.meta
+        defaultOptions: options.mutationKey ? client.getMutationDefaults(options.mutationKey) : undefined
       });
       this.add(mutation);
       return mutation;
@@ -1774,7 +1776,7 @@
             const queryFnContext = {
               queryKey: context.queryKey,
               pageParam: param,
-              meta: context.meta
+              meta: context.options.meta
             };
             addSignalProperty(queryFnContext);
             const queryFnResult = queryFn(queryFnContext);
@@ -2910,19 +2912,26 @@
     }
 
     createResult(query, options) {
-      var _state$data, _state$data2, _state$fetchMeta, _state$fetchMeta$fetc, _state$fetchMeta2, _state$fetchMeta2$fet;
+      var _state$fetchMeta, _state$fetchMeta$fetc, _state$fetchMeta2, _state$fetchMeta2$fet, _state$data, _state$data2;
 
       const {
         state
       } = query;
       const result = super.createResult(query, options);
+      const {
+        isFetching,
+        isRefetching
+      } = result;
+      const isFetchingNextPage = isFetching && ((_state$fetchMeta = state.fetchMeta) == null ? void 0 : (_state$fetchMeta$fetc = _state$fetchMeta.fetchMore) == null ? void 0 : _state$fetchMeta$fetc.direction) === 'forward';
+      const isFetchingPreviousPage = isFetching && ((_state$fetchMeta2 = state.fetchMeta) == null ? void 0 : (_state$fetchMeta2$fet = _state$fetchMeta2.fetchMore) == null ? void 0 : _state$fetchMeta2$fet.direction) === 'backward';
       return { ...result,
         fetchNextPage: this.fetchNextPage,
         fetchPreviousPage: this.fetchPreviousPage,
         hasNextPage: hasNextPage(options, (_state$data = state.data) == null ? void 0 : _state$data.pages),
         hasPreviousPage: hasPreviousPage(options, (_state$data2 = state.data) == null ? void 0 : _state$data2.pages),
-        isFetchingNextPage: state.fetchStatus === 'fetching' && ((_state$fetchMeta = state.fetchMeta) == null ? void 0 : (_state$fetchMeta$fetc = _state$fetchMeta.fetchMore) == null ? void 0 : _state$fetchMeta$fetc.direction) === 'forward',
-        isFetchingPreviousPage: state.fetchStatus === 'fetching' && ((_state$fetchMeta2 = state.fetchMeta) == null ? void 0 : (_state$fetchMeta2$fet = _state$fetchMeta2.fetchMore) == null ? void 0 : _state$fetchMeta2$fet.direction) === 'backward'
+        isFetchingNextPage,
+        isFetchingPreviousPage,
+        isRefetching: isRefetching && !isFetchingNextPage && !isFetchingPreviousPage
       };
     }