Skip to content

Email for professionals and teams

improve Composer for mobile #116

Hieu Nguyen (Jack)b50101389eee
diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsx
index 0ced9c1..5868ad4 100644
--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx
+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx
@@ -191,7 +191,7 @@ export default function MessageDetailPage() {
<div ref={scrollRef} onScroll={handleScroll} className="h-full overflow-y-auto overscroll-contain scrollbar-gutter-stable flex-1 min-h-0">
{!message.read && <MarkAsRead messageId={message.id} />}
- <h1 className={clsx(!isAnyPanelVisible ? "sm:pl-16" : "sm:pl-10", "pl-3 pr-3 pb-2 pt-2 text-2xl text-neutral-900 sm:pr-6")} title={message.subject ?? t("list.noSubject")}>
+ <h1 className={clsx(!isAnyPanelVisible ? "sm:pl-16" : "sm:pl-10", "px-4 pb-2 pt-2 text-2xl text-neutral-900 sm:pr-6")} title={message.subject ?? t("list.noSubject")}>
{message.subject ?? t("list.noSubject")}
</h1>
{/* <div className="px-6">
@@ -217,9 +217,9 @@ export default function MessageDetailPage() {
expandedAll={threadExpanded}
onExpandedAllChange={setThreadExpanded}
/>
- <article className={clsx("px-3 py-4 sm:px-6", !isAnyPanelVisible && "sm:pl-12")}>
+ <article className={clsx("py-4 sm:px-6", !isAnyPanelVisible && "sm:pl-12")}>
<div className="w-full">
- <div className="flex flex-wrap items-start justify-between gap-x-3 gap-y-1 pb-5 sm:pl-4">
+ <div className="flex flex-wrap items-start justify-between gap-x-3 gap-y-1 px-4 pb-5 sm:px-0 sm:pl-4">
<div className="flex min-w-0 items-start gap-3">
<ContactAvatar
mailboxId={message.mailboxId}
@@ -290,8 +290,8 @@ export default function MessageDetailPage() {
</dl>
)}
</div>
- {scheduledAt && <div className="sm:pl-10"><ScheduledSendBanner messageId={message.id} scheduledAt={scheduledAt} /></div>}
- <div className="prose max-w-none text-neutral-900 sm:pl-16">
+ {scheduledAt && <div className="px-4 sm:px-0 sm:pl-10"><ScheduledSendBanner messageId={message.id} scheduledAt={scheduledAt} /></div>}
+ <div className="prose max-w-none px-4 text-neutral-900 sm:px-0 sm:pl-16">
{htmlBody ? (
<EmailHtmlRenderer key={message.id} className="mx-auto" html={htmlBody} />
) : (
@@ -308,7 +308,7 @@ export default function MessageDetailPage() {
))}
</div>
{cloudAttachmentResult.attachments.length > 0 && (
- <section className="mt-8 border-t border-neutral-100 py-6 sm:pl-16">
+ <section className="mt-8 border-t border-neutral-100 px-4 py-6 sm:px-0 sm:pl-16">
<h2 className="mb-3 text-sm font-semibold text-neutral-900">
{t("message.cloudFiles", { count: cloudAttachmentResult.attachments.length })}
</h2>
@@ -337,7 +337,7 @@ export default function MessageDetailPage() {
</section>
)}
{attachments.length > 0 && (
- <section className="mt-8 border-t border-neutral-100 py-6 sm:pl-16">
+ <section className="mt-8 border-t border-neutral-100 px-4 py-6 sm:px-0 sm:pl-16">
<h2 className="mb-3 text-sm font-semibold text-neutral-900">
{t("message.attachments", { count: attachments.length })}
</h2>
diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
index 592f341..c67f5af 100644
--- a/src/app/(dashboard)/layout.tsx
+++ b/src/app/(dashboard)/layout.tsx
@@ -84,7 +84,7 @@ export default function DashboardLayout({
</aside>
</div>
</div>
- <FloatingComposer />
+ <FloatingComposer showButton />
</div>
</ShortcutsProvider>
</MailSearchProvider>
diff --git a/src/app/globals.css b/src/app/globals.css
index d9662e4..2d7c2bb 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -66,6 +66,39 @@ pre {
}
}
+/* Phone compose sheet: full height, slides up from the bottom;
+ on close it slides away again. */
+@keyframes compose-sheet-in {
+ from { transform: translateY(100%); }
+ to { transform: translateY(0); }
+}
+
+@media (max-width: 767px) {
+ .compose-sheet {
+ overscroll-behavior: contain;
+ transition: transform 280ms cubic-bezier(0.2, 0.8, 0.2, 1);
+ }
+ .compose-sheet-closing {
+ transform: translateY(100%) !important;
+ transition: transform 260ms cubic-bezier(0.4, 0, 1, 1) !important;
+ }
+}
+
+@media (max-width: 767px) and (prefers-reduced-motion: no-preference) {
+ .compose-sheet { animation: compose-sheet-in 360ms cubic-bezier(0.2, 0.8, 0.2, 1); }
+}
+
+/* Bottom-sheet dialogs (send options): slide up from the bottom edge. */
+@keyframes slide-sheet-out {
+ from { transform: translateY(0); }
+ to { transform: translateY(100%); }
+}
+
+.slide-sheet[data-state="open"] { animation: compose-sheet-in 300ms cubic-bezier(0.2, 0.8, 0.2, 1) both; }
+.slide-sheet[data-state="closed"] { animation: slide-sheet-out 200ms cubic-bezier(0.4, 0, 1, 1) both; }
+.slide-sheet-overlay[data-state="open"] { animation: dialog-overlay-show 200ms ease-out both; }
+.slide-sheet-overlay[data-state="closed"] { animation: dialog-overlay-hide 160ms ease-in both; }
+
.dialog-overlay[data-state="open"] {
animation: dialog-overlay-show 180ms ease-out both;
}
diff --git a/src/components/compose/compose-form.tsx b/src/components/compose/compose-form.tsx
index b574e87..c19b7f1 100644
--- a/src/components/compose/compose-form.tsx
+++ b/src/components/compose/compose-form.tsx
@@ -17,6 +17,8 @@ import { useCompose } from "@/components/compose/compose-context";
import { cn } from "@/lib/utils";
import { SendReview } from "@/components/agent/send-review";
import type { ReviewSnapshot } from "@/components/agent/send-review-types";
+import { useIsMobile } from "@/components/sidebar-mobile-utils";
+import { useSheetViewport } from "./use-sheet-viewport";
import { buildSendFormData, fetchDraft, formatAttachmentSize } from "./utils";
import { RecipientInput } from "./recipient-input";
import { RichTextEditor } from "./rich-text-editor";
@@ -77,6 +79,32 @@ export function ComposeForm({
const [loadedDraftFrom, setLoadedDraftFrom] = useState<string | null>(null);
const [selectedFrom, setSelectedFrom] = useState("");
const formRef = useRef<HTMLFormElement>(null);
+ useSheetViewport(formRef, mode === "popup");
+ const isPhone = useIsMobile();
+ const phoneSheet = mode === "popup" && isPhone;
+ const [closing, setClosing] = useState(false);
+ const dragStart = useRef<number | null>(null);
+ const [dragY, setDragY] = useState(0);
+
+ // Phones: slide the sheet away and let the page behind grow back before unmounting.
+ function dismiss() {
+ if (!onClose) return;
+ if (!phoneSheet || closing) { onClose(); return; }
+ setClosing(true);
+ window.setTimeout(onClose, 260);
+ }
+
+ const sheetDrag = phoneSheet ? {
+ onTouchStart: (event: React.TouchEvent) => { dragStart.current = event.touches[0].clientY; },
+ onTouchMove: (event: React.TouchEvent) => {
+ if (dragStart.current !== null) setDragY(Math.max(0, event.touches[0].clientY - dragStart.current));
+ },
+ onTouchEnd: () => {
+ dragStart.current = null;
+ if (dragY > 110) dismiss();
+ setDragY(0);
+ },
+ } : {};
const saveTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
const pendingSave = useRef<(() => Promise<void>) | null>(null);
const draftGeneration = useRef(0);
@@ -357,7 +385,7 @@ export function ComposeForm({
window.dispatchEvent(new Event("mailflare:messages-changed"));
if (onClose) {
- onClose();
+ dismiss();
return;
}
router.push("/sent");
@@ -400,7 +428,7 @@ export function ComposeForm({
window.dispatchEvent(new Event("mailflare:messages-changed"));
if (onClose) {
- onClose();
+ dismiss();
return;
}
setDeletingDraft(false);
@@ -532,18 +560,20 @@ export function ComposeForm({
</div>
);
+ // Below md the popup is a bottom sheet: full width, anchored to the visual viewport (so the keyboard never covers the toolbar) and padded by the bottom safe area.
+ const sheetClass = "compose-sheet max-md:inset-x-0 max-md:bottom-[var(--sheet-bottom,0px)] max-md:left-0 max-md:right-0 max-md:top-auto max-md:z-50 max-md:h-[var(--sheet-height,100dvh)] max-md:w-full max-md:translate-x-0 max-md:translate-y-0 max-md:rounded-none max-md:border-0 max-md:pt-[env(safe-area-inset-top)] max-md:pb-[var(--sheet-pad,max(env(safe-area-inset-bottom),1rem))]";
const frameClass =
mode === "popup"
? minimized
- ? "fixed bottom-0 right-8 z-40 flex h-9 w-[min(260px,calc(100vw-32px))] flex-col overflow-hidden rounded-t-lg border border-neutral-200 bg-white shadow-2xl"
+ ? cn("fixed bottom-0 right-8 z-40 flex h-9 w-[min(260px,calc(100vw-32px))] flex-col overflow-hidden rounded-t-lg border border-neutral-200 bg-white shadow-2xl", sheetClass)
: modalMode
- ? "fixed left-1/2 top-1/2 z-50 flex h-[86vh] w-[min(860px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-lg bg-white shadow-2xl"
- : "fixed bottom-0 right-8 z-40 flex h-[min(520px,calc(100vh-88px))] w-[min(560px,calc(100vw-32px))] flex-col overflow-hidden rounded-t-lg border border-neutral-200 bg-white shadow-2xl"
+ ? cn("fixed left-1/2 top-1/2 z-50 flex h-[86vh] w-[min(860px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden rounded-lg bg-white shadow-2xl", sheetClass)
+ : cn("fixed bottom-0 right-8 z-40 flex h-[min(520px,calc(100vh-88px))] w-[min(560px,calc(100vw-32px))] flex-col overflow-hidden rounded-t-lg border border-neutral-200 bg-white shadow-2xl", sheetClass)
: "relative flex h-full min-h-[720px] w-full max-w-4xl flex-col overflow-hidden rounded-xl border border-neutral-200 bg-white shadow-sm";
return (
<>
- {agentReview && <SendReview approvalId={agentReview.approvalId} snapshot={agentReview.snapshot} onClose={() => setAgentReview(null)} onSent={() => { setAgentReview(null); if (onClose) onClose(); else router.push("/sent"); }} />}
+ {agentReview && <SendReview approvalId={agentReview.approvalId} snapshot={agentReview.snapshot} onClose={() => setAgentReview(null)} onSent={() => { setAgentReview(null); if (onClose) dismiss(); else router.push("/sent"); }} />}
{mode === "popup" && modalMode && !minimized && <div className="fixed inset-0 z-40 bg-neutral-950/65" aria-hidden="true" />}
{toast && (
<div
@@ -556,13 +586,13 @@ export function ComposeForm({
{toast.message}
</div>
)}
- <form onSubmit={onSubmit} className={frameClass} ref={formRef} role={modalMode && !minimized ? "dialog" : mode === "popup" ? "region" : undefined} aria-modal={modalMode && !minimized || undefined} aria-label={mode === "popup" ? t("compose.dialogLabel") : undefined} onKeyDown={(event) => { if (modalMode && !minimized && event.key === "Escape") { event.preventDefault(); setModalMode(false); } }} onDragEnterCapture={minimized ? undefined : onFileDragEnter} onDragOverCapture={minimized ? undefined : onFileDragOver} onDragLeaveCapture={minimized ? undefined : onFileDragLeave} onDropCapture={minimized ? undefined : onFileDrop}>
+ <form onSubmit={onSubmit} className={cn(frameClass, closing && "compose-sheet-closing")} style={dragY ? { transform: `translateY(${dragY}px)`, transition: "none" } : undefined} ref={formRef} role={modalMode && !minimized ? "dialog" : mode === "popup" ? "region" : undefined} aria-modal={modalMode && !minimized || undefined} aria-label={mode === "popup" ? t("compose.dialogLabel") : undefined} onKeyDown={(event) => { if (modalMode && !minimized && event.key === "Escape") { event.preventDefault(); setModalMode(false); } }} onDragEnterCapture={minimized ? undefined : onFileDragEnter} onDragOverCapture={minimized ? undefined : onFileDragOver} onDragLeaveCapture={minimized ? undefined : onFileDragLeave} onDropCapture={minimized ? undefined : onFileDrop}>
{draggingFiles && !minimized && (
<div className="pointer-events-none absolute inset-0 z-30 flex items-center justify-center border-2 border-dashed border-blue-400 bg-blue-50/90 text-sm font-medium text-blue-700" aria-hidden="true">
{t("compose.dropFiles")}
</div>
)}
- <div className="flex h-9 shrink-0 items-center justify-between bg-neutral-800 text-white dark:bg-neutral-100 px-4 text-sm font-medium">
+ <div {...sheetDrag} className="flex h-9 shrink-0 items-center justify-between max-md:h-12 max-md:touch-none bg-neutral-800 text-white dark:bg-neutral-100 px-4 text-sm font-medium">
<span className="flex min-w-0 items-center gap-2 truncate dark:text-neutral-900">
{threading?.inReplyTo && <Reply className="h-3.5 w-3.5 text-neutral-300" />}
{!threading?.inReplyTo && /^fwd?:/i.test(subject) && <Forward className="h-3.5 w-3.5 text-neutral-300" />}
@@ -578,13 +608,13 @@ export function ComposeForm({
</span>
{mode === "popup" && (
<div className="flex shrink-0 items-center gap-3 text-neutral-300">
- <button type="button" onClick={() => { setMinimized((current) => !current); setDraggingFiles(false); }} aria-label={minimized ? t("compose.restore") : t("compose.minimize")} title={minimized ? t("compose.restore") : t("compose.minimize")} className="rounded p-1 hover:bg-neutral-700 dark:hover:bg-neutral-200 hover:text-white">
+ <button type="button" onClick={() => { setMinimized((current) => !current); setDraggingFiles(false); }} aria-label={minimized ? t("compose.restore") : t("compose.minimize")} title={minimized ? t("compose.restore") : t("compose.minimize")} className="max-md:hidden rounded p-1 hover:bg-neutral-700 dark:hover:bg-neutral-200 hover:text-white">
{minimized ? <ChevronUp className="h-4 w-4" /> : <Minus className="h-4 w-4" />}
</button>
- <button type="button" onClick={() => { if (minimized) setMinimized(false); setModalMode((current) => !current); }} aria-label={modalMode ? t("compose.restoreFloating") : t("compose.openModal")} title={modalMode ? t("compose.restoreFloating") : t("compose.openModal")} className="rounded p-1 dark:hover:bg-neutral-200 hover:bg-neutral-700 hover:text-white">
+ <button type="button" onClick={() => { if (minimized) setMinimized(false); setModalMode((current) => !current); }} aria-label={modalMode ? t("compose.restoreFloating") : t("compose.openModal")} title={modalMode ? t("compose.restoreFloating") : t("compose.openModal")} className="max-md:hidden rounded p-1 dark:hover:bg-neutral-200 hover:bg-neutral-700 hover:text-white">
{modalMode ? <Minimize2 className="h-4 w-4" /> : <Maximize2 className="h-4 w-4" />}
</button>
- <button type="button" onClick={onClose} aria-label={t("compose.close")} className="rounded p-1 hover:bg-neutral-700 dark:hover:bg-neutral-200 hover:text-white">
+ <button type="button" onClick={dismiss} aria-label={t("compose.close")} className="rounded p-1 max-md:-m-2 max-md:p-3 hover:bg-neutral-700 dark:hover:bg-neutral-200 hover:text-white">
<X className="h-4 w-4" />
</button>
</div>
@@ -677,13 +707,16 @@ export function ComposeForm({
placeholder={t("compose.bodyPlaceholder")}
footerContent={attachmentContent}
toolbarStart={
- <>
- <div className="flex items-center">
+ <div className="flex items-center max-md:contents">
+ <Button type="button" variant="secondary" size="sm" onClick={dismiss} className="md:hidden max-md:h-10 max-md:px-3.5 max-md:text-[15px]">
+ {t("common.cancel")}
+ </Button>
+ <div className="flex items-center max-md:order-last max-md:ml-auto">
<Button
type="submit"
size="sm"
disabled={loading || loadingDraft || !fromAddr}
- className="rounded-r-none px-4"
+ className="rounded-r-none px-4 max-md:h-10 max-md:px-5 max-md:text-[15px]"
>
{loading ? t("compose.preparing") : scheduledAt ? t("compose.schedule") : agentRevision !== null ? t("compose.reviewSend") : t("compose.send")}
</Button>
@@ -699,7 +732,7 @@ export function ComposeForm({
}}
/>
</div>
- </>
+ </div>
}
toolbarEnd={
<>
@@ -717,19 +750,19 @@ export function ComposeForm({
aria-label={t("compose.attachFiles")}
onClick={() => attachmentInput.current?.click()}
disabled={loading || loadingDraft}
- className="rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900 disabled:pointer-events-none disabled:opacity-50"
+ className="rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900 disabled:pointer-events-none disabled:opacity-50 max-md:px-2"
>
<Paperclip className="h-4 w-4" />
</button>
</Tooltip>
- <span className="flex-1" />
+ <span className="flex-1 max-md:hidden" />
<Tooltip label={t("compose.deleteDraft")}>
<button
type="button"
aria-label={t("compose.deleteDraft")}
onClick={() => void deleteDraftAndClose()}
disabled={loading || loadingDraft || deletingDraft}
- className="rounded-md p-1.5 text-neutral-500 hover:bg-red-50 hover:text-red-600 disabled:pointer-events-none disabled:opacity-50"
+ className="rounded-md p-1.5 text-neutral-500 hover:bg-red-50 hover:text-red-600 disabled:pointer-events-none disabled:opacity-50 max-md:px-2"
>
<Trash2 className="h-4 w-4" />
</button>
diff --git a/src/components/compose/floating-composer.tsx b/src/components/compose/floating-composer.tsx
index ee0007b..3f26a6f 100644
--- a/src/components/compose/floating-composer.tsx
+++ b/src/components/compose/floating-composer.tsx
@@ -1,15 +1,32 @@
"use client";
+import { MailPlus } from "lucide-react";
import { usePathname, useRouter } from "next/navigation";
import { ComposeForm } from "@/components/compose/compose-form";
import { useCompose } from "@/components/compose/compose-context";
+import { useSidebar } from "@/components/sidebar-state";
+import { useLanguage } from "@/components/language-provider";
-export function FloatingComposer() {
- const { open, draftId, closeComposer, notice } = useCompose();
+/** `showButton` adds the phone Compose button; only the dashboard pages (mail) pass it. */
+export function FloatingComposer({ showButton = false }: { showButton?: boolean }) {
+ const { open, draftId, openComposer, closeComposer, notice } = useCompose();
const pathname = usePathname();
const router = useRouter();
+ const { t } = useLanguage();
+ const { mobileOpen } = useSidebar();
return (
<>
+ {showButton && !open && !mobileOpen && (
+ <button
+ type="button"
+ onClick={openComposer}
+ aria-label={t("navigation.compose")}
+ className="fixed right-[max(1rem,env(safe-area-inset-right))] bottom-[max(1rem,env(safe-area-inset-bottom))] z-30 flex h-12 items-center gap-3 rounded-2xl bg-blue-100 px-5 text-base font-medium text-blue-950 shadow-sm transition-colors hover:bg-blue-200 active:bg-blue-200 md:hidden"
+ >
+ <MailPlus size={19} />
+ {t("navigation.compose")}
+ </button>
+ )}
{notice && (
<div role="status" className="fixed right-6 top-6 z-[60] rounded-lg bg-green-600 px-4 py-3 text-sm font-medium text-white shadow-lg">
{notice}
diff --git a/src/components/compose/rich-text-editor.tsx b/src/components/compose/rich-text-editor.tsx
index dc0a908..cd960c6 100644
--- a/src/components/compose/rich-text-editor.tsx
+++ b/src/components/compose/rich-text-editor.tsx
@@ -135,8 +135,56 @@ export function RichTextEditor({
}
}
+ const formatButtons = (
+ <>
+ {COMMANDS.map((item) => (
+ <Tooltip key={item.command} label={t(item.labelKey)}>
+ <button
+ type="button"
+ aria-label={t(item.labelKey)}
+ aria-pressed={!!active[item.command]}
+ disabled={disabled}
+ onMouseDown={(event) => event.preventDefault()}
+ onClick={() => run(item.command, item.value)}
+ className={cn(
+ "rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900",
+ active[item.command] && "bg-neutral-200 text-neutral-900",
+ )}
+ >
+ <item.icon className="h-4 w-4" />
+ </button>
+ </Tooltip>
+ ))}
+ <Tooltip label={t("editor.insertLinkHint")}>
+ <button
+ type="button"
+ aria-label={t("editor.insertLink")}
+ disabled={disabled}
+ onMouseDown={(event) => event.preventDefault()}
+ onClick={openLink}
+ className="rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900"
+ >
+ <Link2 className="h-4 w-4" />
+ </button>
+ </Tooltip>
+ <Tooltip label={t("editor.clearFormatting")}>
+ <button
+ type="button"
+ aria-label={t("editor.clearFormatting")}
+ disabled={disabled}
+ onMouseDown={(event) => event.preventDefault()}
+ onClick={() => run("removeFormat")}
+ className="rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900"
+ >
+ <RemoveFormatting className="h-4 w-4" />
+ </button>
+ </Tooltip>
+ </>
+ );
+
return (
<div className={cn("flex min-h-0 flex-1 flex-col", className)}>
+ <div className="sticky top-0 z-10 flex shrink-0 items-center gap-0.5 overflow-x-auto bg-white px-2 py-1 md:hidden">{formatButtons}</div>
<div className="relative min-h-0 flex-1 overflow-y-auto">
<div
ref={editorRef}
@@ -176,50 +224,9 @@ export function RichTextEditor({
)}
</div>
{footerContent}
- <div className="relative flex items-center gap-0.5 border-t border-neutral-100 px-4 py-3">
+ <div className="relative flex items-center gap-0.5 max-md:gap-2 border-t border-neutral-100 px-4 py-3 max-md:border-t-0">
{toolbarStart}
- {COMMANDS.map((item) => (
- <Tooltip key={item.command} label={t(item.labelKey)}>
- <button
- type="button"
- aria-label={t(item.labelKey)}
- aria-pressed={!!active[item.command]}
- disabled={disabled}
- onMouseDown={(event) => event.preventDefault()}
- onClick={() => run(item.command, item.value)}
- className={cn(
- "rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900",
- active[item.command] && "bg-neutral-200 text-neutral-900",
- )}
- >
- <item.icon className="h-4 w-4" />
- </button>
- </Tooltip>
- ))}
- <Tooltip label={t("editor.insertLinkHint")}>
- <button
- type="button"
- aria-label={t("editor.insertLink")}
- disabled={disabled}
- onMouseDown={(event) => event.preventDefault()}
- onClick={openLink}
- className="rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900"
- >
- <Link2 className="h-4 w-4" />
- </button>
- </Tooltip>
- <Tooltip label={t("editor.clearFormatting")}>
- <button
- type="button"
- aria-label={t("editor.clearFormatting")}
- disabled={disabled}
- onMouseDown={(event) => event.preventDefault()}
- onClick={() => run("removeFormat")}
- className="rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900"
- >
- <RemoveFormatting className="h-4 w-4" />
- </button>
- </Tooltip>
+ <div className="contents max-md:hidden">{formatButtons}</div>
{toolbarEnd}
{linkOpen && (
<form
diff --git a/src/components/compose/schedule-send-menu.tsx b/src/components/compose/schedule-send-menu.tsx
index 7676bfe..9922534 100644
--- a/src/components/compose/schedule-send-menu.tsx
+++ b/src/components/compose/schedule-send-menu.tsx
@@ -13,14 +13,30 @@ import {
parseDateTimeLocal,
} from "./schedule-send-utils";
import type { ScheduleSendMenuProps } from "./schedule-send-types";
+import { useIsMobile } from "@/components/sidebar-mobile-utils";
+import { ScheduleSendSheet } from "./schedule-send-sheet";
import { getUserTimeZone } from "@/lib/time/utils";
export function ScheduleSendMenu({ disabled, value, onChange, mailboxId, from, onApplyTemplate }: ScheduleSendMenuProps) {
const { t } = useLanguage();
const [newTemplateOpen, setNewTemplateOpen] = useState(false);
+ const [sheetOpen, setSheetOpen] = useState(false);
+ const isPhone = useIsMobile();
const options = getScheduleSendOptions();
const minimum = new Date(Date.now() + 5 * 60 * 1000);
+ if (isPhone) {
+ return (
+ <>
+ <button type="button" disabled={disabled} aria-label={t("schedule.optionsLabel")} onClick={() => setSheetOpen(true)} className="inline-flex h-8 items-center justify-center rounded-r-lg border-l border-blue-500 bg-blue-600 px-2 text-white max-md:h-10 max-md:px-2.5 transition-colors hover:bg-blue-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50">
+ <ChevronDown className="h-4 w-4" />
+ </button>
+ <ScheduleSendSheet open={sheetOpen} onOpenChange={setSheetOpen} value={value} onChange={onChange} onApplyTemplate={onApplyTemplate} onNewTemplate={() => setNewTemplateOpen(true)} />
+ <NewTemplateDialog open={newTemplateOpen} onOpenChange={setNewTemplateOpen} mailboxId={mailboxId} from={from} />
+ </>
+ );
+ }
+
return (
<>
<DropdownMenu.Root>
@@ -28,7 +44,7 @@ export function ScheduleSendMenu({ disabled, value, onChange, mailboxId, from, o
type="button"
disabled={disabled}
aria-label={t("schedule.optionsLabel")}
- className="inline-flex h-8 items-center justify-center rounded-r-lg border-l border-blue-500 bg-blue-600 px-2 text-white transition-colors hover:bg-blue-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
+ className="inline-flex h-8 items-center justify-center rounded-r-lg border-l border-blue-500 bg-blue-600 px-2 text-white max-md:h-10 max-md:px-2.5 transition-colors hover:bg-blue-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
>
<ChevronDown className="h-4 w-4" />
</DropdownMenu.Trigger>
diff --git a/src/components/compose/schedule-send-sheet.tsx b/src/components/compose/schedule-send-sheet.tsx
new file mode 100644
index 0000000..36fc0ca
--- /dev/null
+++ b/src/components/compose/schedule-send-sheet.tsx
@@ -0,0 +1,161 @@
+"use client";
+
+import * as DialogPrimitive from "@radix-ui/react-dialog";
+import { useEffect, useRef, useState } from "react";
+import { CalendarClock, ChevronLeft, ChevronRight, FileText, Plus, X } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { useLanguage } from "@/components/language-provider";
+import { authFetch } from "@/lib/auth/client";
+import { cn } from "@/lib/utils";
+import { getUserTimeZone } from "@/lib/time/utils";
+import { textToHtml } from "./rich-text-utils";
+import { formatDateTimeLocal, formatScheduledSend, getScheduleSendOptions, parseDateTimeLocal } from "./schedule-send-utils";
+import type { ScheduleSendSheetProps } from "./schedule-send-types";
+import type { ComposeTemplate } from "./template-types";
+
+type Page = "root" | "date" | "templates";
+const PAGES: Page[] = ["root", "date", "templates"];
+
+const pageClass = "flex max-h-[calc(85dvh-3.5rem)] w-full shrink-0 flex-col px-2 pb-3";
+
+const rowClass = "flex min-h-12 w-full items-center gap-3 rounded-xl px-3 text-left text-base text-neutral-900 active:bg-neutral-100";
+
+/** Phone version of the Send options menu: a bottom sheet whose pages slide in (root → date, templates). */
+export function ScheduleSendSheet({ open, onOpenChange, value, onChange, onApplyTemplate, onNewTemplate }: ScheduleSendSheetProps) {
+ const { t } = useLanguage();
+ const [page, setPage] = useState<Page>("root");
+ const [templates, setTemplates] = useState<ComposeTemplate[]>([]);
+ const [draftDate, setDraftDate] = useState("");
+ const pageRefs = useRef<Record<Page, HTMLDivElement | null>>({ root: null, date: null, templates: null });
+ const [height, setHeight] = useState<number | undefined>(undefined);
+
+ // The sheet is as tall as the page showing, and eases between heights as pages slide.
+ useEffect(() => {
+ const element = pageRefs.current[page];
+ if (!open || !element) return;
+ const measure = () => setHeight(element.offsetHeight);
+ measure();
+ const observer = new ResizeObserver(measure);
+ observer.observe(element);
+ return () => observer.disconnect();
+ }, [open, page, templates.length, value]);
+
+ useEffect(() => {
+ if (!open) return;
+ setPage("root");
+ setDraftDate(value ? formatDateTimeLocal(value) : "");
+ void authFetch("/api/templates", { cache: "no-store" })
+ .then(async (response) => {
+ if (response.ok) setTemplates(((await response.json()) as { templates: ComposeTemplate[] }).templates);
+ })
+ .catch(() => {});
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [open]);
+
+ const options = getScheduleSendOptions();
+ const minimum = formatDateTimeLocal(new Date(Date.now() + 5 * 60 * 1000));
+ const parsedDate = parseDateTimeLocal(draftDate);
+ const title = page === "date" ? t("schedule.pick", { timeZone: getUserTimeZone() }) : page === "templates" ? t("template.menu") : t("schedule.heading");
+
+ function choose(date: Date | null) {
+ onChange(date);
+ onOpenChange(false);
+ }
+
+ return (
+ <DialogPrimitive.Root open={open} onOpenChange={onOpenChange}>
+ <DialogPrimitive.Portal>
+ <DialogPrimitive.Overlay className="slide-sheet-overlay fixed inset-0 z-[70] bg-black/40" />
+ <DialogPrimitive.Content
+ aria-label={t("schedule.optionsLabel")}
+ aria-describedby={undefined}
+ className="slide-sheet fixed inset-x-0 bottom-0 z-[70] max-h-[85dvh] overflow-hidden rounded-t-3xl bg-white pb-[env(safe-area-inset-bottom)] shadow-2xl outline-none"
+ >
+ <div className="flex h-14 items-center gap-1 px-2">
+ {page === "root" ? <span className="w-10" /> : (
+ <button type="button" onClick={() => setPage("root")} className="flex h-10 w-10 items-center justify-center rounded-full text-neutral-700 active:bg-neutral-100">
+ <ChevronLeft className="h-6 w-6" />
+ <span className="sr-only">{t("schedule.heading")}</span>
+ </button>
+ )}
+ <DialogPrimitive.Title className="flex-1 truncate text-center text-base font-semibold text-neutral-900">{title}</DialogPrimitive.Title>
+ <DialogPrimitive.Close className="flex h-10 w-10 items-center justify-center rounded-full text-neutral-700 active:bg-neutral-100">
+ <X className="h-5 w-5" />
+ <span className="sr-only">{t("navigation.close")}</span>
+ </DialogPrimitive.Close>
+ </div>
+ <div className="overflow-hidden transition-[height] duration-300 ease-[cubic-bezier(0.2,0.8,0.2,1)] motion-reduce:transition-none" style={{ height }}>
+ <div className="flex items-start transition-transform duration-300 ease-[cubic-bezier(0.2,0.8,0.2,1)] motion-reduce:transition-none" style={{ transform: `translateX(-${PAGES.indexOf(page) * 100}%)` }}>
+ <div ref={(node) => { pageRefs.current.root = node; }} className={pageClass} inert={page !== "root"}>
+ <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain">
+ {value && (
+ <button type="button" onClick={() => choose(null)} className={rowClass}>
+ <X className="h-5 w-5 text-neutral-500" />
+ {t("schedule.clear")}
+ </button>
+ )}
+ {options.map((option) => (
+ <button key={option.labelKey} type="button" onClick={() => choose(option.value)} className={cn(rowClass, "justify-between")}>
+ <span>{t(option.labelKey)}</span>
+ <span className="text-sm text-neutral-500">{option.value && formatScheduledSend(option.value)}</span>
+ </button>
+ ))}
+ </div>
+ <div className="shrink-0 pt-2">
+ <button type="button" onClick={() => setPage("date")} className={cn(rowClass, "justify-between")}>
+ <span className="flex items-center gap-3"><CalendarClock className="h-5 w-5 text-neutral-500" />{t("schedule.pick", { timeZone: getUserTimeZone() })}</span>
+ <ChevronRight className="h-5 w-5 text-neutral-400" />
+ </button>
+ <button type="button" onClick={() => setPage("templates")} className={cn(rowClass, "justify-between")}>
+ <span className="flex items-center gap-3"><FileText className="h-5 w-5 text-neutral-500" />{t("template.menu")}</span>
+ <ChevronRight className="h-5 w-5 text-neutral-400" />
+ </button>
+ </div>
+ </div>
+ <div ref={(node) => { pageRefs.current.date = node; }} className={pageClass} inert={page !== "date"}>
+ <div className="min-h-0 flex-1 overflow-y-auto px-2">
+ <input
+ type="datetime-local"
+ min={minimum}
+ value={draftDate}
+ onChange={(event) => setDraftDate(event.target.value)}
+ aria-label={t("schedule.pick", { timeZone: getUserTimeZone() })}
+ className="h-12 w-full rounded-xl border border-neutral-200 px-3 text-base outline-none focus:border-blue-400"
+ />
+ </div>
+ <div className="shrink-0 px-2 pt-4">
+ <Button type="button" className="h-12 w-full rounded-xl text-base" disabled={!parsedDate} onClick={() => choose(parsedDate)}>
+ {t("schedule.heading")}
+ </Button>
+ </div>
+ </div>
+ <div ref={(node) => { pageRefs.current.templates = node; }} className={pageClass} inert={page !== "templates"}>
+ <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain">
+ {templates.length === 0 && <p className="px-3 py-3 text-sm text-neutral-500">{t("template.none")}</p>}
+ {templates.map((template) => (
+ <button
+ key={template.id}
+ type="button"
+ onClick={() => {
+ onApplyTemplate({ title: template.subject ?? "", html: template.htmlBody ?? textToHtml(template.textBody ?? "") });
+ onOpenChange(false);
+ }}
+ className={rowClass}
+ >
+ <span className="break-words">{template.subject || t("template.untitled")}</span>
+ </button>
+ ))}
+ </div>
+ <div className="shrink-0 pt-2">
+ <button type="button" onClick={() => { onOpenChange(false); onNewTemplate(); }} className={cn(rowClass, "text-blue-600")}>
+ <Plus className="h-5 w-5" />{t("template.new")}
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </DialogPrimitive.Content>
+ </DialogPrimitive.Portal>
+ </DialogPrimitive.Root>
+ );
+}
diff --git a/src/components/compose/schedule-send-types.d.ts b/src/components/compose/schedule-send-types.d.ts
index b760971..abf88e0 100644
--- a/src/components/compose/schedule-send-types.d.ts
+++ b/src/components/compose/schedule-send-types.d.ts
@@ -13,3 +13,12 @@ export type ScheduleSendMenuProps = {
from: string;
onApplyTemplate: (template: { title: string; html: string }) => void;
};
+
+export type ScheduleSendSheetProps = {
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+ value: Date | null;
+ onChange: (value: Date | null) => void;
+ onApplyTemplate: (template: { title: string; html: string }) => void;
+ onNewTemplate: () => void;
+};
diff --git a/src/components/compose/sheet-viewport-utils.ts b/src/components/compose/sheet-viewport-utils.ts
new file mode 100644
index 0000000..e1200d4
--- /dev/null
+++ b/src/components/compose/sheet-viewport-utils.ts
@@ -0,0 +1,11 @@
+const KEYBOARD_THRESHOLD_PX = 120;
+
+export function getSheetViewportStyle(layoutHeight: number, visualHeight: number, visualOffsetTop: number) {
+ const keyboardOpen = layoutHeight - visualHeight > KEYBOARD_THRESHOLD_PX;
+ const bottom = Math.max(0, layoutHeight - visualHeight - visualOffsetTop);
+ return {
+ height: `${Math.round(visualHeight)}px`,
+ bottom: `${Math.round(bottom)}px`,
+ padding: keyboardOpen ? "0.5rem" : "max(env(safe-area-inset-bottom), 1rem)",
+ };
+}
diff --git a/src/components/compose/use-sheet-viewport.ts b/src/components/compose/use-sheet-viewport.ts
new file mode 100644
index 0000000..97a482e
--- /dev/null
+++ b/src/components/compose/use-sheet-viewport.ts
@@ -0,0 +1,27 @@
+import { useEffect } from "react";
+import type { RefObject } from "react";
+import { getSheetViewportStyle } from "./sheet-viewport-utils";
+
+// Mobile browsers keep `position: fixed` anchored to the layout viewport, so the on-screen keyboard or a collapsing
+// address bar would hide the sheet's send toolbar. Track the visual viewport and publish the result as CSS variables.
+export function useSheetViewport(ref: RefObject<HTMLElement | null>, enabled: boolean) {
+ useEffect(() => {
+ const viewport = window.visualViewport;
+ const element = ref.current;
+ if (!enabled || !viewport || !element) return;
+ function update() {
+ if (!viewport || !element) return;
+ const style = getSheetViewportStyle(window.innerHeight, viewport.height, viewport.offsetTop);
+ element.style.setProperty("--sheet-height", style.height);
+ element.style.setProperty("--sheet-bottom", style.bottom);
+ element.style.setProperty("--sheet-pad", style.padding);
+ }
+ update();
+ viewport.addEventListener("resize", update);
+ viewport.addEventListener("scroll", update);
+ return () => {
+ viewport.removeEventListener("resize", update);
+ viewport.removeEventListener("scroll", update);
+ };
+ }, [ref, enabled]);
+}
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 166bb79..74eeaa6 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -12,6 +12,7 @@ const buttonVariants = cva(
outline: "border border-neutral-200 bg-white hover:bg-neutral-100",
ghost: "hover:bg-neutral-100",
destructive: "bg-red-600 text-white hover:bg-red-700",
+ secondary: "bg-neutral-100"
},
size: {
default: "h-10 px-6 py-2 rounded-xl",
diff --git a/tests/sheet-viewport.test.mjs b/tests/sheet-viewport.test.mjs
new file mode 100644
index 0000000..379194f
--- /dev/null
+++ b/tests/sheet-viewport.test.mjs
@@ -0,0 +1,17 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { getSheetViewportStyle } from "../src/components/compose/sheet-viewport-utils.ts";
+
+test("sheet fills the visual viewport when no keyboard is open", () => {
+ const style = getSheetViewportStyle(800, 780, 0);
+ assert.equal(style.height, "780px");
+ assert.equal(style.bottom, "20px");
+ assert.equal(style.padding, "max(env(safe-area-inset-bottom), 1rem)");
+});
+
+test("sheet shrinks above the keyboard and drops safe-area padding", () => {
+ const style = getSheetViewportStyle(800, 450, 0);
+ assert.equal(style.height, "450px");
+ assert.equal(style.bottom, "350px");
+ assert.equal(style.padding, "0.5rem");
+});