Email for professionals and teams
update thread ui
Hieu Nguyen (Jack)1c49a617bc24
diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsxindex 71b3470..13dffa1 100644--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx@@ -17,6 +17,7 @@ import { PreviousMessage } from "@/components/previous-message";import { ConversationThread } from "@/components/messages/conversation-thread";import { ThreadMessageActions } from "@/components/messages/thread-message-actions";import { useMessageThread } from "@/components/messages/use-message-thread";+import { useLatestMessagesFirst } from "@/components/messages/use-latest-messages-first";import { getMessageBackHref } from "@/components/message-actions/utils";import { getEmailAddress, getEmailDisplayName, splitEmailAddressList } from "@/lib/email/address";import type { MessageAttachment, MessageDetailResponse } from "./types";@@ -41,6 +42,7 @@ export default function MessageDetailPage() {const [previewAttachment, setPreviewAttachment] =useState<MessageAttachment | null>(null);const [threadExpanded, setThreadExpanded] = useState(false);+ const [latestMessagesFirst] = useLatestMessagesFirst();usePageLoading(loading);const thread = useMessageThread(messageId, data?.message?.threadId);@@ -132,9 +134,7 @@ export default function MessageDetailPage() {);return (<div className="h-full overflow-y-auto overscroll-contain scrollbar-gutter-stable">- {message.direction === "inbound" && !message.read && (- <MarkAsRead messageId={message.id} />- )}+ {!message.read && <MarkAsRead messageId={message.id} />}<div className="flex pt-3 pb-2.75 items-center justify-between px-2 border-b border-neutral-200 sticky top-0 bg-white"><div className="flex-1" />{/* <div className="flex items-center flex-row gap-6">@@ -169,17 +169,18 @@ export default function MessageDetailPage() {</div><ConversationThreadcurrentMessageId={message.id}- position="before"+ position={latestMessagesFirst ? "after" : "before"}messages={thread.messages}mailboxId={message.mailboxId}currentAccountName={currentAccountName}ownAddress={ownAddress}ownAddresses={ownAddresses}+ latestMessagesFirst={latestMessagesFirst}expandedAll={threadExpanded}onExpandedAllChange={setThreadExpanded}/><article className="px-6 py-4">- <div className="mb-6 flex items-start justify-between border-b border-neutral-100 pb-5">+ <div className="flex items-start justify-between pb-5"><div><p className="text-sm text-neutral-900"><b>@@ -306,12 +307,13 @@ export default function MessageDetailPage() {</article><ConversationThreadcurrentMessageId={message.id}- position="after"+ position={latestMessagesFirst ? "before" : "after"}messages={thread.messages}mailboxId={message.mailboxId}currentAccountName={currentAccountName}ownAddress={ownAddress}ownAddresses={ownAddresses}+ latestMessagesFirst={latestMessagesFirst}expandedAll={threadExpanded}onExpandedAllChange={setThreadExpanded}/>diff --git a/src/components/messages/conversation-thread-types.d.ts b/src/components/messages/conversation-thread-types.d.tsindex d9035c4..6e12459 100644--- a/src/components/messages/conversation-thread-types.d.ts+++ b/src/components/messages/conversation-thread-types.d.ts@@ -10,6 +10,7 @@ export type ConversationThreadProps = {currentAccountName?: string;ownAddress?: string | null;ownAddresses?: string[];+ latestMessagesFirst: boolean;expandedAll: boolean;onExpandedAllChange: (expanded: boolean) => void;};diff --git a/src/components/messages/conversation-thread-utils.ts b/src/components/messages/conversation-thread-utils.tsindex 2f1e0bd..c5b111a 100644--- a/src/components/messages/conversation-thread-utils.ts+++ b/src/components/messages/conversation-thread-utils.ts@@ -6,10 +6,13 @@ export function partitionThread(messages: ThreadMessage[],currentMessageId: string,position: "before" | "after",+ latestMessagesFirst: boolean,): ThreadMessage[] {const index = messages.findIndex((message) => message.id === currentMessageId);- if (index < 0) return position === "before" ? messages : [];- return position === "before" ? messages.slice(0, index) : messages.slice(index + 1);+ const slice = index < 0+ ? position === "before" ? messages : []+ : position === "before" ? messages.slice(0, index) : messages.slice(index + 1);+ return latestMessagesFirst ? [...slice].reverse() : slice;}export function getConversationSender(message: ThreadMessage, currentAccountName?: string): string {@@ -17,6 +20,12 @@ export function getConversationSender(message: ThreadMessage, currentAccountNamereturn message.fromContactName ?? getEmailDisplayName(message.fromAddr);}+export function getConversationSenderEmail(message: ThreadMessage): string {+ if (message.direction === "outbound") return getEmailAddress(message.fromAddr);+ return getEmailAddress(message.fromAddr);+}++/** "to Maya, Sam" style summary for a collapsed card. */export function getConversationRecipients(message: ThreadMessage): string {const names = [...splitEmailAddressList(message.toAddr), ...splitEmailAddressList(message.ccAddr)].map(diff --git a/src/components/messages/conversation-thread.tsx b/src/components/messages/conversation-thread.tsxindex 09b3407..fcb1a83 100644--- a/src/components/messages/conversation-thread.tsx+++ b/src/components/messages/conversation-thread.tsx@@ -1,21 +1,20 @@"use client";-import Link from "next/link";-import { useState } from "react";+import { useEffect, useState } from "react";import dayjs from "dayjs";import { ChevronsUpDown, Paperclip } from "lucide-react";-import { ContactDetailsTrigger } from "@/components/contacts/contact-details";import { ContactAvatar } from "@/components/contacts/contact-avatar";-import { getMessageBackHref } from "@/components/message-actions/utils";+import { runSingleMessageAction } from "@/components/message-actions/utils";import { sanitizeEmailHtml } from "@/app/(dashboard)/inbox/[messageId]/email-html-sanitizer";import { getMessageBodyDisplay, resolveInlineAttachmentUrls } from "@/app/(dashboard)/inbox/[messageId]/utils";-import { getEmailAddress } from "@/lib/email/address";+import { cn } from "@/lib/utils";import type { ConversationMessageCardProps, ConversationThreadProps } from "./conversation-thread-types";import { ThreadMessageActions } from "./thread-message-actions";import {getConversationRecipients,getConversationSender,+ getConversationSenderEmail,partitionThread,} from "./conversation-thread-utils";@@ -31,10 +30,11 @@ export function ConversationThread({currentAccountName,ownAddress,ownAddresses,+ latestMessagesFirst,expandedAll,onExpandedAllChange,}: ConversationThreadProps) {- const slice = partitionThread(messages, currentMessageId, position);+ const slice = partitionThread(messages, currentMessageId, position, latestMessagesFirst);if (slice.length === 0) return null;const firstMessage = slice[0];const lastMessage = slice.at(-1)!;@@ -45,10 +45,10 @@ export function ConversationThread({return (<sectionaria-label={position === "before" ? "Earlier messages in this conversation" : "Later messages in this conversation"}- className={cn(position === "before" ? "" : "pb-6")}+ className={cn(position === (latestMessagesFirst ? "before" : "after") ? "pb-6" : "")}>- <ol className={cn(!collapsed && "divide-y divide-neutral-100", "border-b border-neutral-200")}>- <li className="border-t-0">+ <ol className={cn(!collapsed && "divide-y divide-neutral-200/50", "border-b border-neutral-200")}>+ <li className={latestMessagesFirst ? "border-t" : "border-t-0"}><ConversationMessageCardmessage={firstMessage}mailboxId={mailboxId}@@ -110,13 +110,17 @@ export function ConversationMessageCard({defaultExpanded = false,}: ConversationMessageCardProps) {const [locallyExpanded, setLocallyExpanded] = useState(defaultExpanded);+ const [locallyRead, setLocallyRead] = useState(message.read);const expanded = locallyExpanded;const sender = getConversationSender(message, currentAccountName);+ const senderEmail = getConversationSenderEmail(message);const recipients = getConversationRecipients(message);- const href = `${getMessageBackHref(message.direction, message.status)}/${message.id}`;+ // const href = `${getMessageBackHref(message.direction, message.status)}/${message.id}`;const outbound = message.direction === "outbound";const attachments = message.attachments.filter((attachment) => attachment.disposition === "attachment");+ useEffect(() => setLocallyRead(message.read), [message.read]);+let body: { html: string | null; text: string } | null = null;if (expanded) {const display = getMessageBodyDisplay(message.textBody, message.htmlBody, message.snippet);@@ -128,10 +132,16 @@ export function ConversationMessageCard({return (<article className={cn("bg-white transition-colors px-6", !expanded && "hover:bg-neutral-50")}>- <div className="flex w-full items-center gap-3 py-3">+ <div className="flex w-full items-start gap-3 py-3"><buttontype="button"- onClick={() => setLocallyExpanded((open) => !open)}+ onClick={() => {+ const shouldExpand = !locallyExpanded;+ setLocallyExpanded(shouldExpand);+ if (!shouldExpand || locallyRead) return;+ setLocallyRead(true);+ void runSingleMessageAction(message.id, "read").catch(() => setLocallyRead(false));+ }}aria-expanded={expanded}className="flex min-w-0 flex-1 items-center gap-3 text-left cursor-pointer">@@ -143,17 +153,18 @@ export function ConversationMessageCard({/><span className="min-w-0 flex-1"><div className="flex flex-col">- <span className={cn("truncate text-sm", message.read || outbound ? "text-neutral-900" : "font-semibold text-neutral-900")}>+ <span className={cn("truncate text-sm font-semibold mt-1", locallyRead || outbound ? "text-neutral-900" : "font-semibold text-neutral-900")}>{sender}+ {expanded && <span className="text-xs ml-1 opacity-50 font-normal"><{senderEmail}></span>}</span>{expanded && recipients && <span className="text-xs font-normal text-neutral-500">to {recipients}</span>}</div>{!expanded && (- <span className="block truncate text-xs text-neutral-500">{message.snippet || "No preview"}</span>+ <span className="block truncate text-[13px] text-neutral-500">{message.snippet || "No preview"}</span>)}</span></button>- <span className="flex shrink-0 items-center gap-2 text-xs">+ <span className="flex shrink-0 items-center gap-2 text-xs mr-2 mt-2">{attachments.length > 0 && <Paperclip className="h-3.5 w-3.5" aria-label={`${attachments.length} attachments`} />}{dayjs(message.createdAt).format("MMM DD, YYYY, hh:mmA")}</span>diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsxindex dab27a5..d317ead 100644--- a/src/components/messages/message-folder-page.tsx+++ b/src/components/messages/message-folder-page.tsx@@ -32,6 +32,7 @@ import {getMailboxAddress,runBulkMessageAction,} from "./utils";+import clsx from "clsx";const pageSize = 25;@@ -76,13 +77,12 @@ function MessageListRow({if (compact && config.folder !== "drafts") {return (<div- className={`group grid grid-cols-[20px_minmax(0,1fr)] gap-3 border-l-2 px-4 py-3 transition-colors ${- active- ? "border-l-blue-600 bg-blue-50"- : selected- ? "border-l-transparent bg-neutral-50"- : "border-l-transparent hover:bg-neutral-50"- } ${draggable ? "cursor-grab active:cursor-grabbing" : ""}`}+ className={`group grid grid-cols-[20px_minmax(0,1fr)] gap-3 border-l-2 px-4 py-3 transition-colors ${active+ ? "border-l-blue-600 bg-blue-50"+ : selected+ ? "border-l-transparent bg-neutral-50"+ : "border-l-transparent hover:bg-neutral-50"+ } ${draggable ? "cursor-grab active:cursor-grabbing" : ""}`}draggable={draggable}onDragStart={(event) => {if (!draggable) return;@@ -98,22 +98,22 @@ function MessageListRow({/><Link href={href} onClick={onMessageNavigate} className="min-w-0"><span className="flex items-baseline justify-between gap-3">- <span className={getMessagePartyClassName(message, config.folder)}>+ <span className={clsx(unread && "font-semibold",getMessagePartyClassName(message, config.folder))}>{party}++ {(message.threadCount ?? 1) > 1 && (+ <span className="ml-2 text-xs font-normal text-neutral-500">{message.threadCount}</span>+ )}</span>- <span className="shrink-0 text-[11px] text-neutral-400">+ <span className={clsx(unread ?"font-medium":"text-neutral-400","shrink-0 text-[11px]")}>{formatMessageListTimestamp(message.createdAt)}</span></span><span- className={`mt-1 block truncate text-sm ${- unread ? "font-semibold text-neutral-900" : "text-neutral-700"- }`}+ className={`mt-1 block truncate text-sm ${unread ? "font-semibold text-neutral-900" : "text-neutral-700"+ }`}>{message.subject ?? "(no subject)"}- {(message.threadCount ?? 1) > 1 && (- <span className="ml-1 text-xs font-normal text-neutral-500">({message.threadCount})</span>- )}</span><span className="mt-0.5 block truncate text-xs leading-5 text-neutral-500">{preview}@@ -124,8 +124,7 @@ function MessageListRow({}const className =- `group relative grid min-h-12 w-full grid-cols-[24px_32px_minmax(160px,240px)_1fr_auto] items-center gap-3 px-6 text-left text-sm hover:z-10 hover:bg-[#f2f6fc] hover:shadow-sm ${- active || selected ? "bg-blue-50" : ""+ `group relative grid min-h-12 w-full grid-cols-[24px_32px_minmax(160px,240px)_1fr_auto] items-center gap-3 px-6 text-left text-sm hover:z-10 hover:bg-[#f2f6fc] hover:shadow-sm ${active || selected ? "bg-blue-50" : ""} ${draggable ? "cursor-grab active:cursor-grabbing" : ""}`;const content = (<>@@ -149,23 +148,23 @@ function MessageListRow({{(config.folder !== "inbox" || message.direction !== "inbound") && (<Icon className="h-4 w-4 text-neutral-300" />)}- <span className={getMessagePartyClassName(rowMessage, config.folder)}>+ <span className={clsx(unread && "font-semibold", getMessagePartyClassName(rowMessage, config.folder))}>{party}++ {(message.threadCount ?? 1) > 1 && (+ <span className="ml-2 text-xs text-neutral-500">{message.threadCount}</span>+ )}</span><span className="truncate text-neutral-700">- <span className={unread ? "font-bold text-neutral-900" : ""}>+ <span className={unread ? "font-semibold text-neutral-900" : ""}>{rowMessage.subject ?? "(no subject)"}</span>- {(message.threadCount ?? 1) > 1 && (- <span className="ml-1 text-xs text-neutral-500">({message.threadCount})</span>- )}<span className="text-neutral-500"> - {getMessagePreview(rowMessage, config.folder)}</span></span><timedateTime={message.createdAt}- className={`min-w-[96px] whitespace-nowrap text-right text-xs group-hover:opacity-0 ${- unread ? "font-semibold text-neutral-800" : "text-neutral-500"- }`}+ className={`min-w-[96px] whitespace-nowrap text-right text-xs group-hover:opacity-0 ${unread ? "font-semibold text-neutral-800" : "text-neutral-500"+ }`}>{formatMessageListTimestamp(message.createdAt)}</time>diff --git a/src/components/messages/use-latest-messages-first.ts b/src/components/messages/use-latest-messages-first.tsnew file mode 100644index 0000000..bdcc221--- /dev/null+++ b/src/components/messages/use-latest-messages-first.ts@@ -0,0 +1,40 @@+import { useCallback, useEffect, useState } from "react";++const STORAGE_KEY = "mailflare-latest-messages-first";+const CHANGE_EVENT = "mailflare:latest-messages-first-changed";++function readStored(): boolean {+ try {+ return localStorage.getItem(STORAGE_KEY) !== "off";+ } catch {+ return true;+ }+}++/** Whether conversations display newest to oldest. Enabled by default. */+export function useLatestMessagesFirst(): [boolean, (next: boolean) => void] {+ const [enabled, setEnabled] = useState(true);++ useEffect(() => {+ const sync = () => setEnabled(readStored());+ sync();+ window.addEventListener(CHANGE_EVENT, sync);+ window.addEventListener("storage", sync);+ return () => {+ window.removeEventListener(CHANGE_EVENT, sync);+ window.removeEventListener("storage", sync);+ };+ }, []);++ const update = useCallback((next: boolean) => {+ try {+ localStorage.setItem(STORAGE_KEY, next ? "on" : "off");+ } catch {+ // Private mode or blocked storage: the toggle still applies for this page.+ }+ setEnabled(next);+ window.dispatchEvent(new Event(CHANGE_EVENT));+ }, []);++ return [enabled, update];+}diff --git a/src/components/settings/inbox-threading-settings.tsx b/src/components/settings/inbox-threading-settings.tsxindex c305001..1e32d13 100644--- a/src/components/settings/inbox-threading-settings.tsx+++ b/src/components/settings/inbox-threading-settings.tsx@@ -2,19 +2,32 @@import { Switch } from "@/components/ui/switch";import { useConversationView } from "@/components/messages/use-conversation-view";+import { useLatestMessagesFirst } from "@/components/messages/use-latest-messages-first";export function InboxThreadingSettings() {const [conversationView, setConversationView] = useConversationView();+ const [latestMessagesFirst, setLatestMessagesFirst] = useLatestMessagesFirst();return (- <label className="flex items-start gap-3 rounded-xl bg-neutral-50 p-4">- <span className="flex-1">- <span className="block text-sm font-medium text-neutral-900">Group emails into conversations</span>- <span className="mt-1 block text-sm text-neutral-500">- Show related messages together as a single thread in message lists.+ <div className="space-y-3">+ <label className="flex items-start gap-3 rounded-xl bg-neutral-50 p-4">+ <span className="flex-1">+ <span className="block text-sm font-medium text-neutral-900">Group emails into conversations</span>+ <span className="mt-1 block text-sm text-neutral-500">+ Show related messages together as a single thread in message lists.+ </span></span>- </span>- <Switch checked={conversationView} onCheckedChange={setConversationView} />- </label>+ <Switch checked={conversationView} onCheckedChange={setConversationView} />+ </label>+ <label className="flex items-start gap-3 rounded-xl bg-neutral-50 p-4">+ <span className="flex-1">+ <span className="block text-sm font-medium text-neutral-900">Sort latest messages first</span>+ <span className="mt-1 block text-sm text-neutral-500">+ Show the newest email at the top of a conversation. Turn this off to show it last.+ </span>+ </span>+ <Switch checked={latestMessagesFirst} onCheckedChange={setLatestMessagesFirst} />+ </label>+ </div>);}