@adventurelabs/scout-core 1.4.32 → 1.4.33

package/dist/hooks/useInfiniteQuery.js

@@ -426,10 +426,13 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
     const prevHerdIdRef = useRef(undefined);
     const lastAddedCursorRef = useRef(undefined);
     const pagesLengthRef = useRef(0);
+    /** When true, pass null to the query so we don't request (newHerdId, oldCursor) before state commits. */
+    const forceNullCursorRef = useRef(false);
+    const cursorForQuery = forceNullCursorRef.current ? null : currentCursor;
     const currentQuery = useGetFeedInfiniteByHerdQuery({
         herdId,
         limit,
-        cursor: currentCursor,
+        cursor: cursorForQuery,
         supabase: options.supabase,
     }, { skip: !enabled });
     const isLoading = currentQuery.isLoading;
@@ -442,6 +445,7 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
             prevHerdIdRef.current !== herdId &&
             enabled &&
             herdId) {
+            forceNullCursorRef.current = true;
             setPages([]);
             setCurrentCursor(null);
             setCurrentResult(null);
@@ -457,19 +461,26 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
     useEffect(() => {
         if (!currentQuery.data || currentQuery.isLoading)
             return;
-        const cursor = currentCursor;
+        const cursor = cursorForQuery;
         const items = Array.isArray(currentQuery.data.items)
             ? currentQuery.data.items
             : [];
-        const hasMore = currentQuery.data.hasMore ?? false;
         const nextCursor = currentQuery.data.nextCursor ?? null;
+        // Derive hasMore from items we received (like dummy), so we don't get stuck when API
+        // returns hasMore: false e.g. due to RPC/PostgREST returning fewer rows than limit.
+        const hasMore = (items.length >= limit || (items.length > 0 && items.length < limit)) &&
+            nextCursor != null;
+        // After herd switch we force null cursor; once we've merged that first page, allow normal cursor again
+        if (cursor === null) {
+            forceNullCursorRef.current = false;
+        }
         // Only update currentResult for successful response (match dummy)
         if (items.length === 0 && cursor === null) {
             // Leave currentResult unchanged on spurious empty first page
         }
         else {
             setCurrentResult({
-                hasMore: hasMore && nextCursor != null,
+                hasMore,
                 nextCursor,
             });
         }
@@ -501,7 +512,7 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
     }, [
         currentQuery.data,
         currentQuery.isLoading,
-        currentCursor,
+        cursorForQuery,
         pages.length,
         limit,
     ]);
@@ -513,6 +524,7 @@ export const useInfiniteFeedByHerd = (herdId, options) => {
         }
     }, [currentResult, isLoading]);
     const refetch = useCallback(() => {
+        forceNullCursorRef.current = true;
         setPages([]);
         setCurrentCursor(null);
         setCurrentResult(null);
@@ -559,10 +571,12 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
     const prevDeviceIdRef = useRef(undefined);
     const lastAddedCursorRef = useRef(undefined);
     const pagesLengthRef = useRef(0);
+    const forceNullCursorRef = useRef(false);
+    const cursorForQuery = forceNullCursorRef.current ? null : currentCursor;
     const currentQuery = useGetFeedInfiniteByDeviceQuery({
         deviceId,
         limit: options.limit || 20,
-        cursor: currentCursor,
+        cursor: cursorForQuery,
         supabase: options.supabase,
     }, { skip: !options.enabled || !deviceId });
     useEffect(() => {
@@ -572,6 +586,7 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
     useEffect(() => {
         if (prevDeviceIdRef.current !== undefined &&
             prevDeviceIdRef.current !== deviceId) {
+            forceNullCursorRef.current = true;
             setPages([]);
             setCurrentCursor(null);
             lastAddedCursorRef.current = undefined;
@@ -586,35 +601,39 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
     useEffect(() => {
         if (!currentQuery.data || currentQuery.isLoading)
             return;
+        const cursor = cursorForQuery;
+        if (cursor === null) {
+            forceNullCursorRef.current = false;
+        }
         if (pagesLengthRef.current > 0 &&
-            feedCursorEq(lastAddedCursorRef.current ?? null, currentCursor))
+            feedCursorEq(lastAddedCursorRef.current ?? null, cursor))
             return;
-        const nextResult = {
-            hasMore: currentQuery.data?.hasMore ?? false,
-            nextCursor: currentQuery.data?.nextCursor ?? null,
-        };
-        setLastResult(nextResult);
+        const items = Array.isArray(currentQuery.data?.items)
+            ? currentQuery.data.items
+            : [];
+        const limitForPage = options.limit || 20;
+        const nextCursor = currentQuery.data?.nextCursor ?? null;
+        const hasMore = (items.length >= limitForPage ||
+            (items.length > 0 && items.length < limitForPage)) &&
+            nextCursor != null;
+        setLastResult({ hasMore, nextCursor });
         setPages((prev) => {
-            const existingPage = prev.find((p) => feedCursorEq(p.cursor, currentCursor));
+            const existingPage = prev.find((p) => feedCursorEq(p.cursor, cursor));
             if (!existingPage) {
-                const items = Array.isArray(currentQuery.data?.items)
-                    ? currentQuery.data.items
-                    : [];
-                const limit = options.limit || 20;
-                if (items.length >= limit) {
-                    lastAddedCursorRef.current = currentCursor;
+                if (items.length >= limitForPage) {
+                    lastAddedCursorRef.current = cursor;
                 }
                 return [
                     ...prev,
-                    { cursor: currentCursor, data: items },
+                    { cursor, data: items },
                 ];
             }
             return prev;
         });
-        if (nextResult.hasMore && nextResult.nextCursor != null) {
-            setCurrentCursor(nextResult.nextCursor);
+        if (hasMore && nextCursor != null) {
+            setCurrentCursor(nextCursor);
         }
-    }, [currentQuery.data, currentQuery.isLoading, currentCursor, pages.length, options.limit]);
+    }, [currentQuery.data, currentQuery.isLoading, cursorForQuery, pages.length, options.limit]);
     const loadMore = useCallback(() => {
         if (lastResult?.hasMore &&
             lastResult.nextCursor != null &&
@@ -623,6 +642,7 @@ export const useInfiniteFeedByDevice = (deviceId, options) => {
         }
     }, [lastResult, currentQuery.isLoading]);
     const refetch = useCallback(() => {
+        forceNullCursorRef.current = true;
         setPages([]);
         setCurrentCursor(null);
         lastAddedCursorRef.current = undefined;

package/package.json

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