Add isFetchedAfterMount

ConrabOpto · Oct 2, 2024 · 4b94e90 · 4b94e90
1 parent 6468a88
commit 4b94e90
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/packages/mst-query/package-lock.json b/packages/mst-query/package-lock.json
diff --git a/packages/mst-query/package.json b/packages/mst-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mst-query",
-    "version": "3.4.0-canary.11",
+    "version": "3.4.0-canary.15",
     "description": "Query library for mobx-state-tree",
     "source": "src/index.ts",
     "main": "dist/mst-query.js",

diff --git a/packages/mst-query/src/MstQueryHandler.ts b/packages/mst-query/src/MstQueryHandler.ts
@@ -50,10 +50,15 @@ export class QueryObserver {
     options: any;
     isQuery: boolean;
     isMounted = false;
+    isFetchedAfterMount = false;
 
     constructor(query: any, isQuery: boolean) {
         this.query = query;
         this.isQuery = isQuery;
+
+        makeObservable(this, {
+            isFetchedAfterMount: observable,
+        });
     }
 
     subscribe() {
@@ -375,6 +380,9 @@ export class MstQueryHandler {
             if (!this.isFetched) {
                 this.isFetched = true;
             }
+            this.queryObservers.forEach((observer) => {
+                observer.isFetchedAfterMount = true;
+            });
 
             if (this.model.isMutation) {
                 this.notify({ onMutate: true }, data, this.model);

diff --git a/packages/mst-query/src/hooks.ts b/packages/mst-query/src/hooks.ts
@@ -1,5 +1,5 @@
 import { getSnapshot, getType, Instance, isStateTreeNode, SnapshotIn } from 'mobx-state-tree';
-import { useCallback, useContext, useEffect, useRef, useState } from 'react';
+import { useContext, useEffect, useRef, useState } from 'react';
 import { VolatileQuery, MutationReturnType, QueryReturnType } from './create';
 import { Context } from './QueryClientProvider';
 import { QueryClient } from './QueryClient';
@@ -81,6 +81,7 @@ export function useQuery<T extends Instance<QueryReturnType>>(
         query: query,
         refetch: query.refetch,
         isStale: query.__MstQueryHandler.isStale(options),
+        isFetchedAfterMount: observer.isFetchedAfterMount,
     };
 }