From fb68a880f26095d6260e28b635f7431df76428a2 Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Thu, 27 Apr 2023 00:04:07 +0100
Subject: [PATCH] fix: check if there is a next page before loading the list
 next page

---
 src/components/common/CharacterList.tsx      | 2 +-
 src/components/common/Comment.tsx            | 2 +-
 src/components/main/MainFeed.tsx             | 2 +-
 src/pages/dashboard/[subdomain]/comments.tsx | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/common/CharacterList.tsx b/src/components/common/CharacterList.tsx
index b67d4dd0..efd95f9b 100644
--- a/src/components/common/CharacterList.tsx
+++ b/src/components/common/CharacterList.tsx
@@ -30,7 +30,7 @@ export const CharacterList: React.FC<{
           overscan={10}
           style={{ height: Infinity }}
           className="h-screen"
-          endReached={() => loadMore()}
+          endReached={() => hasMore && loadMore()}
           components={{
             Footer: hasMore ? Loader : undefined,
           }}
diff --git a/src/components/common/Comment.tsx b/src/components/common/Comment.tsx
index 7a28f204..eb87df56 100644
--- a/src/components/common/Comment.tsx
+++ b/src/components/common/Comment.tsx
@@ -43,7 +43,7 @@ export const Comment: React.FC<{
         className="xlog-comment-list"
         useWindowScroll
         data={comments.data?.pages}
-        endReached={() => comments.fetchNextPage()}
+        endReached={() => comments.hasNextPage && comments.fetchNextPage()}
         components={{
           Footer: comments.isLoading ? Loader : undefined,
         }}
diff --git a/src/components/main/MainFeed.tsx b/src/components/main/MainFeed.tsx
index 800b983b..32b3cc02 100644
--- a/src/components/main/MainFeed.tsx
+++ b/src/components/main/MainFeed.tsx
@@ -278,7 +278,7 @@ export const MainFeed: React.FC<{
           <div className="xlog-posts !-mt-0">
             <Virtuoso
               overscan={5}
-              endReached={() => feed.fetchNextPage()}
+              endReached={() => feed.hasNextPage && feed.fetchNextPage()}
               useWindowScroll
               data={feed.data?.pages}
               itemContent={(_, posts) =>
diff --git a/src/pages/dashboard/[subdomain]/comments.tsx b/src/pages/dashboard/[subdomain]/comments.tsx
index 55e83875..2bd32b2d 100644
--- a/src/pages/dashboard/[subdomain]/comments.tsx
+++ b/src/pages/dashboard/[subdomain]/comments.tsx
@@ -63,7 +63,9 @@ export default function CommentsPage() {
               className="xlog-comment-list"
               useWindowScroll
               data={comments.data?.pages}
-              endReached={() => comments.fetchNextPage()}
+              endReached={() =>
+                comments.hasNextPage && comments.fetchNextPage()
+              }
               components={{
                 Footer: comments.isLoading ? Loader : undefined,
               }}