@adventurelabs/scout-core 1.4.25 → 1.4.28

package/dist/hooks/useInfiniteQuery.js

@@ -417,9 +417,10 @@ const feedCursorEq = (a, b) => {
 export const useInfiniteFeedByHerd = (herdId, options) => {
     const [pages, setPages] = useState([]);
     const [currentCursor, setCurrentCursor] = useState(null);
+    // Match dummy: use state so hasMore/nextCursor trigger re-renders and loadMore sees latest (ref was not updating UI)
+    const [lastResult, setLastResult] = useState(null);
     const prevHerdIdRef = useRef(undefined);
     const lastAddedCursorRef = useRef(undefined);
-    const lastResultRef = useRef(null);
     const pagesLengthRef = useRef(0);
     const currentQuery = useGetFeedInfiniteByHerdQuery({
         herdId,
@@ -437,7 +438,7 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
             setPages([]);
             setCurrentCursor(null);
             lastAddedCursorRef.current = undefined;
-            lastResultRef.current = null;
+            setLastResult(null);
         }
         prevHerdIdRef.current = herdId;
     }, [herdId]);
@@ -456,11 +457,13 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
             ? currentQuery.data.items
             : [];
         const limit = options.limit || 20;
-        // Store hasMore/nextCursor from this response so loadMore can use it (like dummy's currentResult)
-        lastResultRef.current = {
+        // Defer lastResult to next tick so consumer's IntersectionObserver is recreated
+        // after hasMore is true and its callback can fire (sentinel may already be in view).
+        const nextResult = {
             hasMore: currentQuery.data.hasMore ?? false,
             nextCursor: currentQuery.data.nextCursor ?? null,
         };
+        queueMicrotask(() => setLastResult(nextResult));
         setPages((prev) => {
             const existingPage = prev.find((p) => feedCursorEq(p.cursor, currentCursor));
             if (!existingPage) {
@@ -476,18 +479,17 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
         });
     }, [currentQuery.data, currentQuery.isLoading, currentCursor, pages.length, options.limit]);
     const loadMore = useCallback(() => {
-        const result = lastResultRef.current;
-        if (result?.hasMore &&
-            result.nextCursor != null &&
+        if (lastResult?.hasMore &&
+            lastResult.nextCursor != null &&
             !currentQuery.isLoading) {
-            setCurrentCursor(result.nextCursor);
+            setCurrentCursor(lastResult.nextCursor);
         }
-    }, [currentQuery.isLoading]);
+    }, [lastResult, currentQuery.isLoading]);
     const refetch = useCallback(() => {
         setPages([]);
         setCurrentCursor(null);
         lastAddedCursorRef.current = undefined;
-        lastResultRef.current = null;
+        setLastResult(null);
         currentQuery.refetch();
     }, [currentQuery]);
     const allItems = useMemo(() => {
@@ -504,7 +506,7 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
         items: allItems,
         isLoading: currentQuery.isLoading && pages.length === 0,
         isLoadingMore: currentQuery.isLoading && pages.length > 0,
-        hasMore: (lastResultRef.current?.hasMore ??
+        hasMore: (lastResult?.hasMore ??
             (currentCursor !== null && pages.length > 0)) ??
             false,
         loadMore,
@@ -515,9 +517,9 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
 export const useInfiniteFeedByDevice = (deviceId, options) => {
     const [pages, setPages] = useState([]);
     const [currentCursor, setCurrentCursor] = useState(null);
+    const [lastResult, setLastResult] = useState(null);
     const prevDeviceIdRef = useRef(undefined);
     const lastAddedCursorRef = useRef(undefined);
-    const lastResultRef = useRef(null);
     const pagesLengthRef = useRef(0);
     const currentQuery = useGetFeedInfiniteByDeviceQuery({
         deviceId,
@@ -535,7 +537,7 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
             setPages([]);
             setCurrentCursor(null);
             lastAddedCursorRef.current = undefined;
-            lastResultRef.current = null;
+            setLastResult(null);
         }
         prevDeviceIdRef.current = deviceId;
     }, [deviceId]);
@@ -549,6 +551,11 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
         if (pagesLengthRef.current > 0 &&
             feedCursorEq(lastAddedCursorRef.current ?? null, currentCursor))
             return;
+        const nextResult = {
+            hasMore: currentQuery.data?.hasMore ?? false,
+            nextCursor: currentQuery.data?.nextCursor ?? null,
+        };
+        queueMicrotask(() => setLastResult(nextResult));
         setPages((prev) => {
             const existingPage = prev.find((p) => feedCursorEq(p.cursor, currentCursor));
             if (!existingPage) {
@@ -559,10 +566,6 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
                 if (items.length >= limit) {
                     lastAddedCursorRef.current = currentCursor;
                 }
-                lastResultRef.current = {
-                    hasMore: currentQuery.data?.hasMore ?? false,
-                    nextCursor: currentQuery.data?.nextCursor ?? null,
-                };
                 return [
                     ...prev,
                     { cursor: currentCursor, data: items },
@@ -572,18 +575,17 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
         });
     }, [currentQuery.data, currentQuery.isLoading, currentCursor, pages.length, options.limit]);
     const loadMore = useCallback(() => {
-        const result = lastResultRef.current;
-        if (result?.hasMore &&
-            result.nextCursor != null &&
+        if (lastResult?.hasMore &&
+            lastResult.nextCursor != null &&
             !currentQuery.isLoading) {
-            setCurrentCursor(result.nextCursor);
+            setCurrentCursor(lastResult.nextCursor);
         }
-    }, [currentQuery.isLoading]);
+    }, [lastResult, currentQuery.isLoading]);
     const refetch = useCallback(() => {
         setPages([]);
         setCurrentCursor(null);
         lastAddedCursorRef.current = undefined;
-        lastResultRef.current = null;
+        setLastResult(null);
         currentQuery.refetch();
     }, [currentQuery]);
     const allItems = useMemo(() => {
@@ -600,7 +602,7 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
         items: allItems,
         isLoading: currentQuery.isLoading && pages.length === 0,
         isLoadingMore: currentQuery.isLoading && pages.length > 0,
-        hasMore: (lastResultRef.current?.hasMore ??
+        hasMore: (lastResult?.hasMore ??
             (currentCursor !== null && pages.length > 0)) ??
             false,
         loadMore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "1.4.25",
+  "version": "1.4.28",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",