@adventurelabs/scout-core 1.4.23 → 1.4.25

package/dist/hooks/useInfiniteQuery.js

@@ -417,25 +417,30 @@ const feedCursorEq = (a, b) => {
 export const useInfiniteFeedByHerd = (herdId, options) => {
     const [pages, setPages] = useState([]);
     const [currentCursor, setCurrentCursor] = useState(null);
-    const prevHerdIdRef = useRef();
+    const prevHerdIdRef = useRef(undefined);
     const lastAddedCursorRef = useRef(undefined);
+    const lastResultRef = useRef(null);
+    const pagesLengthRef = useRef(0);
     const currentQuery = useGetFeedInfiniteByHerdQuery({
         herdId,
         limit: options.limit || 20,
         cursor: currentCursor,
         supabase: options.supabase,
     }, { skip: !options.enabled || !herdId });
+    useEffect(() => {
+        pagesLengthRef.current = pages.length;
+    }, [pages.length]);
+    // Clear all state whenever herd id changes (including to/from undefined)
     useEffect(() => {
         if (prevHerdIdRef.current !== undefined &&
-            prevHerdIdRef.current !== herdId &&
-            options.enabled &&
-            herdId) {
+            prevHerdIdRef.current !== herdId) {
             setPages([]);
             setCurrentCursor(null);
             lastAddedCursorRef.current = undefined;
+            lastResultRef.current = null;
         }
         prevHerdIdRef.current = herdId;
-    }, [herdId, options.enabled]);
+    }, [herdId]);
     // When we request a new page (cursor changed), clear ref so we merge the new response
     useEffect(() => {
         lastAddedCursorRef.current = undefined;
@@ -443,18 +448,22 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
     useEffect(() => {
         if (!currentQuery.data || currentQuery.isLoading)
             return;
-        // Don't skip the first page after reset: only skip when we already have pages for this cursor
-        if (pages.length > 0 &&
+        // Match dummy: only skip merge when we already have pages and this cursor was already added as a full page
+        if (pagesLengthRef.current > 0 &&
             feedCursorEq(lastAddedCursorRef.current ?? null, currentCursor))
             return;
+        const items = Array.isArray(currentQuery.data?.items)
+            ? 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 = {
+            hasMore: currentQuery.data.hasMore ?? false,
+            nextCursor: currentQuery.data.nextCursor ?? null,
+        };
         setPages((prev) => {
             const existingPage = prev.find((p) => feedCursorEq(p.cursor, currentCursor));
             if (!existingPage) {
-                const items = Array.isArray(currentQuery.data?.items)
-                    ? currentQuery.data.items
-                    : [];
-                const limit = options.limit || 20;
-                // Only mark "last added" for full pages so partial/empty responses don't block a later merge
                 if (items.length >= limit) {
                     lastAddedCursorRef.current = currentCursor;
                 }
@@ -467,16 +476,18 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
         });
     }, [currentQuery.data, currentQuery.isLoading, currentCursor, pages.length, options.limit]);
     const loadMore = useCallback(() => {
-        if (currentQuery.data?.hasMore &&
-            currentQuery.data.nextCursor &&
+        const result = lastResultRef.current;
+        if (result?.hasMore &&
+            result.nextCursor != null &&
             !currentQuery.isLoading) {
-            setCurrentCursor(currentQuery.data.nextCursor);
+            setCurrentCursor(result.nextCursor);
         }
-    }, [currentQuery.data, currentQuery.isLoading]);
+    }, [currentQuery.isLoading]);
     const refetch = useCallback(() => {
         setPages([]);
         setCurrentCursor(null);
         lastAddedCursorRef.current = undefined;
+        lastResultRef.current = null;
         currentQuery.refetch();
     }, [currentQuery]);
     const allItems = useMemo(() => {
@@ -493,7 +504,7 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
         items: allItems,
         isLoading: currentQuery.isLoading && pages.length === 0,
         isLoadingMore: currentQuery.isLoading && pages.length > 0,
-        hasMore: (currentQuery.data?.hasMore ??
+        hasMore: (lastResultRef.current?.hasMore ??
             (currentCursor !== null && pages.length > 0)) ??
             false,
         loadMore,
@@ -504,25 +515,30 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
 export const useInfiniteFeedByDevice = (deviceId, options) => {
     const [pages, setPages] = useState([]);
     const [currentCursor, setCurrentCursor] = useState(null);
-    const prevDeviceIdRef = useRef();
+    const prevDeviceIdRef = useRef(undefined);
     const lastAddedCursorRef = useRef(undefined);
+    const lastResultRef = useRef(null);
+    const pagesLengthRef = useRef(0);
     const currentQuery = useGetFeedInfiniteByDeviceQuery({
         deviceId,
         limit: options.limit || 20,
         cursor: currentCursor,
         supabase: options.supabase,
     }, { skip: !options.enabled || !deviceId });
+    useEffect(() => {
+        pagesLengthRef.current = pages.length;
+    }, [pages.length]);
+    // Clear all state whenever device id changes (including to/from undefined)
     useEffect(() => {
         if (prevDeviceIdRef.current !== undefined &&
-            prevDeviceIdRef.current !== deviceId &&
-            options.enabled &&
-            deviceId) {
+            prevDeviceIdRef.current !== deviceId) {
             setPages([]);
             setCurrentCursor(null);
             lastAddedCursorRef.current = undefined;
+            lastResultRef.current = null;
         }
         prevDeviceIdRef.current = deviceId;
-    }, [deviceId, options.enabled]);
+    }, [deviceId]);
     // When we request a new page (cursor changed), clear ref so we merge the new response
     useEffect(() => {
         lastAddedCursorRef.current = undefined;
@@ -530,7 +546,7 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
     useEffect(() => {
         if (!currentQuery.data || currentQuery.isLoading)
             return;
-        if (pages.length > 0 &&
+        if (pagesLengthRef.current > 0 &&
             feedCursorEq(lastAddedCursorRef.current ?? null, currentCursor))
             return;
         setPages((prev) => {
@@ -543,6 +559,10 @@ 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 },
@@ -552,16 +572,18 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
         });
     }, [currentQuery.data, currentQuery.isLoading, currentCursor, pages.length, options.limit]);
     const loadMore = useCallback(() => {
-        if (currentQuery.data?.hasMore &&
-            currentQuery.data.nextCursor &&
+        const result = lastResultRef.current;
+        if (result?.hasMore &&
+            result.nextCursor != null &&
             !currentQuery.isLoading) {
-            setCurrentCursor(currentQuery.data.nextCursor);
+            setCurrentCursor(result.nextCursor);
         }
-    }, [currentQuery.data, currentQuery.isLoading]);
+    }, [currentQuery.isLoading]);
     const refetch = useCallback(() => {
         setPages([]);
         setCurrentCursor(null);
         lastAddedCursorRef.current = undefined;
+        lastResultRef.current = null;
         currentQuery.refetch();
     }, [currentQuery]);
     const allItems = useMemo(() => {
@@ -578,7 +600,7 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
         items: allItems,
         isLoading: currentQuery.isLoading && pages.length === 0,
         isLoadingMore: currentQuery.isLoading && pages.length > 0,
-        hasMore: (currentQuery.data?.hasMore ??
+        hasMore: (lastResultRef.current?.hasMore ??
             (currentCursor !== null && pages.length > 0)) ??
             false,
         loadMore,

package/package.json

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