add nextUri in dependency array (#1217)

openmrs · Dec 2, 2024 · f1bd0cc · f1bd0cc
1 parent fb69d2d
commit f1bd0cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/framework/esm-react-utils/src/useOpenmrsFetchAll.ts b/packages/framework/esm-react-utils/src/useOpenmrsFetchAll.ts
@@ -50,13 +50,13 @@ export function useServerFetchAll<T, R>(
   options: UseServerFetchAllOptions<R> = {},
 ): UseServerInfiniteReturnObject<T, R> {
   const response = useServerInfinite<T, R>(url, serverPaginationHandlers, options);
-  const { hasMore, error, data, loadMore, isLoading } = response;
+  const { hasMore, error, data, loadMore, isLoading, nextUri } = response;
 
   useEffect(() => {
     if (hasMore && !error) {
       loadMore();
     }
-  }, [hasMore, data]);
+  }, [hasMore, nextUri]);
 
   if (options.partialData) {
     return response;

diff --git a/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts b/packages/framework/esm-react-utils/src/useOpenmrsInfinite.ts
@@ -70,6 +70,10 @@ export interface UseServerInfiniteReturnObject<T, R> {
    * from useSWRInfinite
    */
   isLoading: boolean;
+  /**
+   * from useSWRInfinite
+   */
+  nextUri: string | null;
 }
 
 /**
@@ -147,6 +151,7 @@ export function useServerInfinite<T, R>(
     totalCount,
     hasMore,
     loadMore,
+    nextUri,
     ...rest,
   };
 }