tweaks

Author: samwillis

packages/react-db/src/useLiveInfiniteQuery.ts

@@ -148,6 +148,9 @@ export function useLiveInfiniteQuery<TContext extends Context>(
   }, [queryResult.data, loadedPageCount, pageSize, initialPageParam])
 
   // Fetch next page
+  // TODO: this should use the `collection.isLoadingSubset` flag in combination with
+  // isFetchingRef to track if it is fetching from subset for this. This needs adding
+  // once https://github.com/TanStack/db/pull/669 is merged
   const fetchNextPage = useCallback(() => {
     if (!hasNextPage || isFetchingRef.current) return
 
@@ -161,21 +164,12 @@ export function useLiveInfiniteQuery<TContext extends Context>(
   }, [hasNextPage])
 
   return {
+    ...queryResult,
     data: flatData,
     pages,
     pageParams,
     fetchNextPage,
     hasNextPage,
     isFetchingNextPage: isFetchingRef.current,
-    // Pass through useLiveQuery properties
-    state: queryResult.state,
-    collection: queryResult.collection,
-    status: queryResult.status,
-    isLoading: queryResult.isLoading,
-    isReady: queryResult.isReady,
-    isIdle: queryResult.isIdle,
-    isError: queryResult.isError,
-    isCleanedUp: queryResult.isCleanedUp,
-    isEnabled: queryResult.isEnabled,
   }
 }