move condition

zaknesler · May 18, 2024 · c13ca38 · c13ca38
1 parent b1341eb
commit c13ca38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ui/src/components/entry/entry-list.tsx b/ui/src/components/entry/entry-list.tsx
@@ -30,7 +30,7 @@ export const EntryList: Component<EntryListProps> = props => {
   createEffect(() => {
     const bottomOfListVisible =
       props.containerBounds?.bottom && listBounds.bottom && listBounds.bottom <= props.containerBounds?.bottom;
-    if (!bottomOfListVisible || !entries.query.hasNextPage) return;
+    if (!bottomOfListVisible) return;
 
     entries.fetchMore();
   });

diff --git a/ui/src/hooks/queries/use-infinite-entries.ts b/ui/src/hooks/queries/use-infinite-entries.ts
@@ -25,7 +25,9 @@ export const useInfiniteEntries = () => {
   const getAllEntries = () => query.data?.pages.flatMap(page => page.data) || [];
 
   const fetchMore = debounce(() => {
-    if (query.isFetchingNextPage) return;
+    // Only fetch more if we have more to fetch and we're not already fetching
+    if (!query.hasNextPage || query.isFetchingNextPage) return;
+
     query.fetchNextPage();
   }, 100);