Skip to content

Handle fetching error in handle{Top|Bottom}Reached #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtiomTr merged 1 commit into from
Mar 19, 2025
Merged

Handle fetching error in handle{Top|Bottom}Reached #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/shaggy-timers-help.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rchat/react': patch
---

Handle fetching error in handle{Top|Bottom}Reached
64 changes: 35 additions & 29 deletions packages/react/src/useMessages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,21 +206,24 @@ export const useMessages = <TMessage,>({
}

isFetching.current = true;
const { messages: fetchedMessages, noMessagesBefore } = await chatClient.fetchMessages(
roomIdentifier,
additionalChunkSize,
getMessage(0),
undefined,
);

const clipped = unshiftMessages(fetchedMessages);

const newState = {
noMessagesBefore,
noMessagesAfter: !clipped && messagesState.current.noMessagesAfter,
};
messagesState.current = newState;
isFetching.current = false;
try {
const { messages: fetchedMessages, noMessagesBefore } = await chatClient.fetchMessages(
roomIdentifier,
additionalChunkSize,
getMessage(0),
undefined,
);

const clipped = unshiftMessages(fetchedMessages);

const newState = {
noMessagesBefore,
noMessagesAfter: !clipped && messagesState.current.noMessagesAfter,
};
messagesState.current = newState;
} finally {
isFetching.current = false;
}
});

const handleBottomReached = useEvent(async () => {
Expand All @@ -229,21 +232,24 @@ export const useMessages = <TMessage,>({
}

isFetching.current = true;
const { messages: fetchedMessages, noMessagesAfter } = await chatClient.fetchMessages(
roomIdentifier,
additionalChunkSize,
undefined,
getMessage(-1),
);

const clipped = pushMessages(fetchedMessages);
const newState = {
noMessagesAfter,
noMessagesBefore: !clipped && messagesState.current.noMessagesBefore,
};
try {
const { messages: fetchedMessages, noMessagesAfter } = await chatClient.fetchMessages(
roomIdentifier,
additionalChunkSize,
undefined,
getMessage(-1),
);

const clipped = pushMessages(fetchedMessages);
const newState = {
noMessagesAfter,
noMessagesBefore: !clipped && messagesState.current.noMessagesBefore,
};

messagesState.current = newState;
isFetching.current = false;
messagesState.current = newState;
} finally {
isFetching.current = false;
}
});

const onVisibleFrameChange = (frame: Frame) => {
Expand Down