Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions src/app/(dashboard)/archived/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { archivedFolderConfig } from "@/components/messages/message-folder-configs";
import { MessageFolderPage } from "@/components/messages/message-folder-page";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function ArchivedPage() {
return <MessageFolderPage config={archivedFolderConfig} />;
return null;
}
15 changes: 5 additions & 10 deletions src/app/(dashboard)/folders/[folderId]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
"use client";

import { useParams } from "next/navigation";
import { MessageFolderPage } from "@/components/messages/message-folder-page";
import { useCustomFolderConfig } from "@/components/messages/use-custom-folder-config";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function CustomFolderPage() {
const params = useParams<{ folderId: string }>();
const config = useCustomFolderConfig(params.folderId);

return <MessageFolderPage config={config} />;
return null;
}
11 changes: 5 additions & 6 deletions src/app/(dashboard)/inbox/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { inboxFolderConfig } from "@/components/messages/message-folder-configs";
import { MessageFolderPage } from "@/components/messages/message-folder-page";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function InboxPage() {
return <MessageFolderPage config={inboxFolderConfig} />;
return null;
}
11 changes: 5 additions & 6 deletions src/app/(dashboard)/scheduled/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { scheduledFolderConfig } from "@/components/messages/message-folder-configs";
import { MessageFolderPage } from "@/components/messages/message-folder-page";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function ScheduledPage() {
return <MessageFolderPage config={scheduledFolderConfig} />;
return null;
}
11 changes: 5 additions & 6 deletions src/app/(dashboard)/sent/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { sentFolderConfig } from "@/components/messages/message-folder-configs";
import { MessageFolderPage } from "@/components/messages/message-folder-page";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function SentPage() {
return <MessageFolderPage config={sentFolderConfig} />;
return null;
}
11 changes: 5 additions & 6 deletions src/app/(dashboard)/snoozed/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { MessageFolderPage } from "@/components/messages/message-folder-page";
import { snoozedFolderConfig } from "@/components/messages/message-folder-configs";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function SnoozedPage() {
return <MessageFolderPage config={snoozedFolderConfig} />;
return null;
}
11 changes: 5 additions & 6 deletions src/app/(dashboard)/spam/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { spamFolderConfig } from "@/components/messages/message-folder-configs";
import { MessageFolderPage } from "@/components/messages/message-folder-page";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function SpamPage() {
return <MessageFolderPage config={spamFolderConfig} />;
return null;
}
11 changes: 5 additions & 6 deletions src/app/(dashboard)/starred/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { MessageFolderPage } from "@/components/messages/message-folder-page";
import { starredFolderConfig } from "@/components/messages/message-folder-configs";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function StarredPage() {
return <MessageFolderPage config={starredFolderConfig} />;
return null;
}
11 changes: 5 additions & 6 deletions src/app/(dashboard)/trash/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
"use client";

import { trashFolderConfig } from "@/components/messages/message-folder-configs";
import { MessageFolderPage } from "@/components/messages/message-folder-page";

/**
* The folder list is rendered by MessageSplitLayout, the shared parent of the
* folder and message routes, so opening a message never unmounts it.
*/
export default function TrashPage() {
return <MessageFolderPage config={trashFolderConfig} />;
return null;
}
2 changes: 1 addition & 1 deletion src/components/message-actions/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export async function runSingleMessageAction(
}

await throwIfDeleteSkipped(response, action);
dispatchMessagesChanged();
dispatchMessagesChanged({ kind: "removed", action: "delete", messageIds: [messageId] });
}

export function openUnsubscribeUrl(url: string) {
Expand Down
7 changes: 5 additions & 2 deletions src/components/messages/message-folder-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import type { Message } from "@/hooks/types";
import { setMessageDragData } from "@/lib/messages/drag-utils";
import { BulkMessageToolbar } from "./bulk-message-toolbar";
import { useMessageListState } from "./message-list-state";
import { getEmptyPageOffset } from "./page-offset";
import { SwipeableRow } from "./swipeable-row";
import { MessageListRowActions } from "./message-list-row-actions";
import { dispatchMessageCountsDelta, toggleMessageStar } from "./message-list-row-actions-utils";
Expand Down Expand Up @@ -472,8 +473,10 @@ export function MessageFolderPage({
}, [messages, isLoading, setSelectedMessages]);

useEffect(() => {
if (isLoading || offset === 0 || messages.length > 0) return;
setOffset(total > 0 ? Math.floor((total - 1) / limit) * limit : 0);
if (isLoading || messages.length > 0) return;
const nextOffset = getEmptyPageOffset(offset, total, limit);
if (nextOffset === null) return;
setOffset(nextOffset);
}, [isLoading, offset, messages.length, total, limit, setOffset]);

const updateSelectedMessage = useCallback((messageId: string, selected: boolean) => {
Expand Down
101 changes: 60 additions & 41 deletions src/components/messages/message-split-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export function MessageSplitLayout({
? pathname.slice(detailPrefix.length).split("/")[0]
: undefined;
const renderedListWidth = Math.max(250, Math.min(listWidth, (containerWidth || 1000) - 280));
const hasSelectedMessage = Boolean(selectedMessageId);
const grouped = conversationView && config.folder !== "drafts";
const listState = useMemo<MessageListStateControl>(() => ({
selectedMessages,
Expand Down Expand Up @@ -112,53 +113,71 @@ export function MessageSplitLayout({

useEffect(() => () => setForcedMinimal(false), [setForcedMinimal]);

if (!selectedMessageId) {
return (
<MessageListStateContext.Provider value={listState}>
{children}
</MessageListStateContext.Provider>
);
}
// The list lives in the layout, not in a route page, so opening and closing a
// message never unmounts it. That keeps its state (and its paint) intact when
// an action sends the reader back to the folder.
const sidebarList = hasSelectedMessage && twoColumnReading;
const listHidden = hasSelectedMessage && (!twoColumnReading || !listVisible);
const gridTemplateColumns = hasSelectedMessage
? twoColumnReading
? `${listVisible ? renderedListWidth : 0}px minmax(0,1fr)`
: "minmax(0,1fr)"
: "minmax(0,1fr)";

return (
<MessageListStateContext.Provider value={listState}>
<div ref={containerRef} className="h-full min-h-0 overflow-hidden lg:grid lg:transition-[grid-template-columns] lg:ease-in-out motion-reduce:transition-none" style={{ gridTemplateColumns: twoColumnReading ? `${listVisible ? renderedListWidth : 0}px minmax(0,1fr)` : "minmax(0,1fr)", transitionDuration: widthReady ? "300ms" : "0ms" }}>
{twoColumnReading && (
<aside className={`relative hidden min-h-0 min-w-0 overflow-hidden bg-white lg:block ${listVisible ? "border-r border-neutral-200" : "pointer-events-none"}`} aria-hidden={!listVisible} inert={!listVisible}>
<div className={`h-full overflow-hidden transition-transform duration-300 ease-in-out motion-reduce:transition-none ${listVisible ? "translate-x-0" : "-translate-x-full"}`} style={{ width: renderedListWidth }}>
<MessageFolderPage
config={config}
compact
selectedMessageId={selectedMessageId}
/>
<div ref={containerRef} className="h-full min-h-0 overflow-hidden lg:grid lg:transition-[grid-template-columns] lg:ease-in-out motion-reduce:transition-none" style={{ gridTemplateColumns, transitionDuration: widthReady ? "300ms" : "0ms" }}>
<div
className={`relative h-full min-h-0 min-w-0 overflow-hidden bg-white ${
!hasSelectedMessage
? "block"
: sidebarList
? `hidden lg:block ${listVisible ? "border-r border-neutral-200" : "pointer-events-none"}`
: "hidden"
}`}
aria-hidden={listHidden || undefined}
inert={listHidden || undefined}
>
<div
className={`h-full overflow-hidden transition-transform duration-300 ease-in-out motion-reduce:transition-none ${sidebarList ? (listVisible ? "translate-x-0" : "-translate-x-full") : "translate-x-0"}`}
style={{ width: sidebarList ? renderedListWidth : "100%" }}
>
<MessageFolderPage
config={config}
compact={sidebarList}
selectedMessageId={selectedMessageId}
/>
</div>
<ResizeHandle
label={t("list.resize")}
onResizeStart={() => { startWidth.current = listWidth; resizedWidth.current = listWidth; }}
onResize={(delta) => {
const requestedWidth = startWidth.current + delta;
setForcedMinimal(requestedWidth < 250);
resizedWidth.current = Math.max(250, Math.min(requestedWidth, Math.max(250, (containerRef.current?.clientWidth ?? 1000) - 280)));
setListWidth(resizedWidth.current);
}}
onResizeEnd={() => saveColumnWidth(userId, "message-list", resizedWidth.current)}
/>
</aside>
)}
<MessageListVisibilityContext.Provider value={{ visible: listVisible, toggle: () => { const visible = !manualListVisible; setManualListVisible(visible); saveMessageListVisible(visible); }, singleColumn: !twoColumnReading, backHref: config.hrefPrefix, backLabel: config.titleKey ? t(config.titleKey) : config.title }}>
<MessageDetailNavigationProvider config={config} currentMessageId={selectedMessageId}>
<section className="min-h-0 min-w-0 overflow-hidden bg-white flex flex-col h-full">
{showBulkBar && (
<BulkMessageActionBar
folder={config.folderId ? undefined : config.folder}
selectedMessages={selectedMessages}
onClearSelection={() => setSelectedMessages([])}
{sidebarList && listVisible && (
<ResizeHandle
label={t("list.resize")}
onResizeStart={() => { startWidth.current = listWidth; resizedWidth.current = listWidth; }}
onResize={(delta) => {
const requestedWidth = startWidth.current + delta;
setForcedMinimal(requestedWidth < 250);
resizedWidth.current = Math.max(250, Math.min(requestedWidth, Math.max(250, (containerRef.current?.clientWidth ?? 1000) - 280)));
setListWidth(resizedWidth.current);
}}
onResizeEnd={() => saveColumnWidth(userId, "message-list", resizedWidth.current)}
/>
)}
{children}
</section>
</MessageDetailNavigationProvider>
</MessageListVisibilityContext.Provider>
</div>
{selectedMessageId && (
<MessageListVisibilityContext.Provider value={{ visible: listVisible, toggle: () => { const visible = !manualListVisible; setManualListVisible(visible); saveMessageListVisible(visible); }, singleColumn: !twoColumnReading, backHref: config.hrefPrefix, backLabel: config.titleKey ? t(config.titleKey) : config.title }}>
<MessageDetailNavigationProvider config={config} currentMessageId={selectedMessageId}>
<section className="min-h-0 min-w-0 overflow-hidden bg-white flex flex-col h-full">
{showBulkBar && (
<BulkMessageActionBar
folder={config.folderId ? undefined : config.folder}
selectedMessages={selectedMessages}
onClearSelection={() => setSelectedMessages([])}
/>
)}
{children}
</section>
</MessageDetailNavigationProvider>
</MessageListVisibilityContext.Provider>
)}
</div>
</MessageListStateContext.Provider>
);
Expand Down
3 changes: 3 additions & 0 deletions src/components/messages/message-thread-cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
rememberMessageFields,
rememberMessageRows,
} from "@/lib/messages/field-store";
import { rememberMembershipRows } from "@/lib/messages/membership-store";
import type { ThreadMessage, ThreadResponse } from "@/hooks/types";

const CACHE_TTL_MS = 60_000;
Expand Down Expand Up @@ -38,6 +39,7 @@ function cacheThread(messageId: string, messages: ThreadMessage[]): void {
threadCache.delete(messageId);
threadCache.set(messageId, { messages: pendingMessages, expiresAt: Date.now() + CACHE_TTL_MS });
rememberMessageRows(pendingMessages);
rememberMembershipRows(pendingMessages);
if (threadCache.size > CACHE_LIMIT) {
const oldest = threadCache.keys().next().value;
if (oldest) threadCache.delete(oldest);
Expand Down Expand Up @@ -96,6 +98,7 @@ export function patchMessageThreadFieldsInCaches(
)));
threadCache.set(messageId, { ...cached, messages });
rememberMessageRows(messages);
rememberMembershipRows(messages);
}
rememberMessageFields(messageIds, patch);
}
Expand Down
9 changes: 9 additions & 0 deletions src/components/messages/page-offset.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/**
* The page to show after the visible page empties. A page that is still within
* the new total is waiting for its backfill, so leave the offset alone; only an
* out-of-range page (or an empty folder) moves back.
*/
export function getEmptyPageOffset(offset: number, total: number, limit: number): number | null {
if (offset === 0 || offset < total) return null;
return total > 0 ? Math.floor((total - 1) / limit) * limit : 0;
}
2 changes: 1 addition & 1 deletion src/components/messages/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export async function runBulkMessageAction(
});
if (!response.ok) throw new Error(defaultTranslator("error.updateSelected"));
await throwIfDeleteSkipped(response, action);
dispatchMessagesChanged();
dispatchMessagesChanged({ kind: "removed", action: "delete", messageIds });
}

/**
Expand Down
17 changes: 11 additions & 6 deletions src/hooks/use-message-counts.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useState } from "react";
import type { MessageCounts, MessageCountsDelta } from "./types";
import { hasPendingOverlay, subscribePendingOverlay } from "@/lib/messages/field-store";
import { hasMembershipOverlay, subscribeMembership } from "@/lib/messages/membership-store";
import { clearMessageCountsCache, fetchMessageCounts } from "./utils";

const REFRESH_DEBOUNCE_MS = 150;
Expand Down Expand Up @@ -32,13 +33,14 @@ export function useMessageCounts(mailboxId?: string | null, enabled = true) {
let cancelled = false;
let refreshTimer: number | null = null;
let requestNumber = 0;
const hasPending = () => hasPendingOverlay() || hasMembershipOverlay();

async function loadCounts() {
const currentRequest = ++requestNumber;
setIsLoading(true);
try {
const nextCounts = await fetchMessageCounts(mailboxId);
if (!cancelled && currentRequest === requestNumber && !hasPendingOverlay()) {
if (!cancelled && currentRequest === requestNumber && !hasPending()) {
setCounts(nextCounts ?? emptyCounts);
}
} finally {
Expand All @@ -58,13 +60,13 @@ export function useMessageCounts(mailboxId?: string | null, enabled = true) {

// A pending undo has not settled on the server yet. Keep the optimistic
// one-shot delta on screen and fetch authoritative counts only afterwards.
if (hasPendingOverlay()) {
if (hasPending()) {
clearMessageCountsCache();
} else {
void loadCounts();
}
function onMessagesChanged() {
if (hasPendingOverlay()) return;
if (hasPending()) return;
clearMessageCountsCache();
scheduleCountsLoad();
}
Expand All @@ -82,19 +84,21 @@ export function useMessageCounts(mailboxId?: string | null, enabled = true) {
},
}));
}
const unsubscribePending = subscribePendingOverlay(() => {
function onPendingChange() {
// Invalidate a load that started before the overlay changed so its
// server value cannot land on top of the optimistic state.
requestNumber += 1;
clearMessageCountsCache();
if (hasPendingOverlay()) {
if (hasPending()) {
if (refreshTimer) window.clearTimeout(refreshTimer);
refreshTimer = null;
setIsLoading(false);
return;
}
scheduleCountsLoad();
});
}
const unsubscribePending = subscribePendingOverlay(onPendingChange);
const unsubscribeMembership = subscribeMembership(onPendingChange);
window.addEventListener("mailflare:messages-changed", onMessagesChanged);
window.addEventListener("mailflare:message-counts-changed", onMessagesChanged);
window.addEventListener("mailflare:message-counts-delta", onMessageCountsDelta);
Expand All @@ -105,6 +109,7 @@ export function useMessageCounts(mailboxId?: string | null, enabled = true) {
window.removeEventListener("mailflare:message-counts-changed", onMessagesChanged);
window.removeEventListener("mailflare:message-counts-delta", onMessageCountsDelta);
unsubscribePending();
unsubscribeMembership();
if (refreshTimer) window.clearTimeout(refreshTimer);
};
}, [enabled, mailboxId]);
Expand Down
Loading