From 67faf9a63ad6efe13f5015dfb98405cb9aea17d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B4mulo=20Penido?= <romulo.penido@gmail.com>
Date: Fri, 8 Nov 2024 15:59:48 -0300
Subject: [PATCH] fix: infinite scroll bug on library page (#1483)

---
 src/hooks.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/hooks.ts b/src/hooks.ts
index 4275a0b846..1984625cba 100644
--- a/src/hooks.ts
+++ b/src/hooks.ts
@@ -49,6 +49,8 @@ export const useLoadOnScroll = (
 ) => {
   useEffect(() => {
     if (enabled) {
+      const canFetchNextPage = hasNextPage && !isFetchingNextPage;
+
       const onscroll = () => {
         // Verify the position of the scroll to implement an infinite scroll.
         // Used `loadLimit` to fetch next page before reach the end of the screen.
@@ -56,11 +58,18 @@ export const useLoadOnScroll = (
         const scrolledTo = window.scrollY + window.innerHeight;
         const scrollDiff = document.body.scrollHeight - scrolledTo;
         const isNearToBottom = scrollDiff <= loadLimit;
-        if (isNearToBottom && hasNextPage && !isFetchingNextPage) {
+        if (isNearToBottom && canFetchNextPage) {
           fetchNextPage();
         }
       };
       window.addEventListener('scroll', onscroll);
+
+      // If the content is less than the screen height, fetch the next page.
+      const hasNoScroll = document.body.scrollHeight <= window.innerHeight;
+      if (hasNoScroll && canFetchNextPage) {
+        fetchNextPage();
+      }
+
       return () => {
         window.removeEventListener('scroll', onscroll);
       };