@adventurelabs/scout-core 1.4.24 → 1.4.25

package/dist/hooks/useInfiniteQuery.js

@@ -417,29 +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);
-    // Store hasMore/nextCursor from the last merged response (like dummy's currentResult) so loadMore
-    // always has a usable nextCursor even when currentQuery has switched to the next request.
     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;
@@ -447,8 +448,8 @@ 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)
@@ -514,27 +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;
@@ -542,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) => {

package/package.json

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