Skip to content

Email for professionals and teams

Drop removed messages from the selection and step back from an empty page (#87)

Can K.e938c0f0ecef
diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsx
index 033b575..6667a13 100644
--- a/src/components/messages/message-folder-page.tsx
+++ b/src/components/messages/message-folder-page.tsx
@@ -360,6 +360,19 @@ export function MessageFolderPage({
});
}, [title, config.folder, config.folderId, mailboxAddress, mailboxesLoading, titleTotal, titleUnread]);
+ useEffect(() => {
+ if (isLoading) return;
+ setSelectedMessages((current) => {
+ const remaining = current.filter((item) => messages.some((message) => message.id === item.id));
+ return remaining.length === current.length ? current : remaining;
+ });
+ }, [messages, isLoading]);
+
+ useEffect(() => {
+ if (isLoading || offset === 0 || messages.length > 0) return;
+ setOffset(total > 0 ? Math.floor((total - 1) / limit) * limit : 0);
+ }, [isLoading, offset, messages.length, total, limit]);
+
function updateSelectedMessage(messageId: string, selected: boolean) {
const message = messages.find((item) => item.id === messageId);
if (!message) return;