Skip to content

Email for professionals and teams

Fix mobile layout: icon-rail sidebar and narrow-screen wrapping

egamer24e4d765132dc5
diff --git a/src/app/(admin)/layout.tsx b/src/app/(admin)/layout.tsx
index d1e37d8..78ceb4a 100644
--- a/src/app/(admin)/layout.tsx
+++ b/src/app/(admin)/layout.tsx
@@ -24,8 +24,8 @@ export default function DashboardLayout({
<MailboxProvider>
<ComposeProvider>
<ShortcutsProvider>
- <div className="grid h-dvh grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">
- <aside className="relative min-h-0 min-w-0">
+ <div className="grid h-dvh grid-cols-[72px_minmax(0,1fr)] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">
+ <aside className="relative z-30 w-[var(--sidebar-width)] min-h-0 min-w-0 bg-[#f6f8fc]">
<div className="h-full overflow-y-auto overscroll-contain px-3 py-4 scrollbar-gutter-stable">
<AdminNav />
</div>
diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsx
index 2394868..84885df 100644
--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx
+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx
@@ -190,7 +190,7 @@ export default function MessageDetailPage() {
onExpandedAllChange={setThreadExpanded}
/>
<article className="px-6 py-4">
- <div className="flex items-start justify-between pb-5">
+ <div className="flex flex-wrap items-start justify-between gap-x-3 gap-y-1 pb-5">
<div className="flex min-w-0 items-start gap-3">
<ContactAvatar
mailboxId={message.mailboxId}
diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
index 8f75b93..dc39927 100644
--- a/src/app/(dashboard)/layout.tsx
+++ b/src/app/(dashboard)/layout.tsx
@@ -27,8 +27,8 @@ export default function DashboardLayout({
<ComposeProvider>
<MailSearchProvider>
<ShortcutsProvider>
- <div className="grid h-dvh grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">
- <aside className="relative min-h-0 min-w-0">
+ <div className="grid h-dvh grid-cols-[72px_minmax(0,1fr)] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">
+ <aside className="relative z-30 w-[var(--sidebar-width)] min-h-0 min-w-0 bg-[#f6f8fc]">
<div className="h-full overflow-y-auto overscroll-contain px-3 py-4 scrollbar-gutter-stable">
<DashboardNav />
</div>
diff --git a/src/app/(settings)/layout.tsx b/src/app/(settings)/layout.tsx
index 48bd333..16f5dc5 100644
--- a/src/app/(settings)/layout.tsx
+++ b/src/app/(settings)/layout.tsx
@@ -26,8 +26,8 @@ export default function DashboardLayout({
<ComposeProvider>
<MailSearchProvider>
<ShortcutsProvider>
- <div className="grid h-[100dvh] grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">
- <aside className="min-h-0 overflow-y-auto overscroll-contain px-3 py-4 [scrollbar-gutter:stable]">
+ <div className="grid h-[100dvh] grid-cols-[72px_minmax(0,1fr)] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">
+ <aside className="z-30 w-[var(--sidebar-width)] min-h-0 bg-[#f6f8fc] overflow-y-auto overscroll-contain px-3 py-4 [scrollbar-gutter:stable]">
<DashboardNav />
</aside>
<div className="flex min-h-0 min-w-0 flex-col">
diff --git a/src/app/(settings)/settings/layout.tsx b/src/app/(settings)/settings/layout.tsx
index a128ba0..95b40d1 100644
--- a/src/app/(settings)/settings/layout.tsx
+++ b/src/app/(settings)/settings/layout.tsx
@@ -3,7 +3,7 @@ import { SettingsNav } from "@/components/settings/settings-nav";
export default function SettingsLayout({ children }: { children: ReactNode }) {
return (
- <div className="flex flex-row gap-4 min-h-[calc(100dvh-4rem)] bg-inherit">
+ <div className="flex flex-col-reverse justify-end gap-4 min-h-[calc(100dvh-4rem)] bg-inherit md:flex-row md:justify-start">
<div className="min-w-0 flex-1 pt-4">
<div className="mx-auto w-full max-w-3xl">{children}</div>
</div>
diff --git a/src/components/message-actions/message-actions.tsx b/src/components/message-actions/message-actions.tsx
index 3426e6f..baccaa1 100644
--- a/src/components/message-actions/message-actions.tsx
+++ b/src/components/message-actions/message-actions.tsx
@@ -223,9 +223,9 @@ export function MessageActions({
const moveActions = getMoveMessageActions(status, direction);
return (
- <div className="flex items-center gap-3 text-neutral-600">
+ <div className="flex flex-wrap items-center justify-end gap-3 text-neutral-600">
{error && <span className="text-xs text-red-600">{error}</span>}
- <div className="flex items-center gap-2">
+ <div className="flex flex-wrap items-center justify-end gap-1 sm:gap-2">
<Tooltip label={shortcutsEnabled ? "Reply (r)" : "Reply"}>
<Button
type="button"
diff --git a/src/components/messages/conversation-thread.tsx b/src/components/messages/conversation-thread.tsx
index 15aa007..1a0abe9 100644
--- a/src/components/messages/conversation-thread.tsx
+++ b/src/components/messages/conversation-thread.tsx
@@ -136,7 +136,7 @@ export function ConversationMessageCard({
return (
<article className={cn("bg-white transition-colors px-6", !expanded && "hover:bg-neutral-50")}>
- <div className="flex w-full items-start gap-3 py-3">
+ <div className="flex w-full flex-wrap items-start gap-x-3 py-3">
<button
type="button"
onClick={() => {
@@ -147,7 +147,7 @@ export function ConversationMessageCard({
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"
+ className="flex min-w-0 flex-1 basis-40 items-center gap-3 text-left cursor-pointer"
>
<ContactAvatar
mailboxId={mailboxId}
diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsx
index 69d4b9c..d2db5cc 100644
--- a/src/components/messages/message-folder-page.tsx
+++ b/src/components/messages/message-folder-page.tsx
@@ -11,6 +11,7 @@ import { useCompose } from "@/components/compose/compose-context";
import { useMailSearch } from "@/components/mail-search/mail-search-context";
import { useSelectedMailbox } from "@/components/mailbox-provider";
import { usePageLoading } from "@/components/page-loading";
+import { useIsMobile } from "@/components/sidebar-state";
import { useMessageCounts } from "@/hooks/use-message-counts";
import { useMessages } from "@/hooks/use-messages";
import type { BulkMessageAction } from "@/app/api/messages/bulk/types";
@@ -244,6 +245,7 @@ export function MessageFolderPage({
}: MessageFolderPageProps) {
const { selectedMailbox, isLoading: mailboxesLoading } = useSelectedMailbox();
const { query } = useMailSearch();
+ const isMobile = useIsMobile();
const [offset, setOffset] = useState(0);
const [internalSelectedMessages, setInternalSelectedMessages] = useState<
Array<{ id: string; read: boolean }>
@@ -456,7 +458,7 @@ export function MessageFolderPage({
config={config}
selected={selectedIds.includes(message.id)}
active={message.id === selectedMessageId}
- compact={compact}
+ compact={compact || isMobile}
currentAccountName={currentAccountName}
onSelectedChange={updateSelectedMessage}
onMessageAction={(messageId, action) =>
diff --git a/src/components/settings/settings-nav.tsx b/src/components/settings/settings-nav.tsx
index 5c06caa..26756b2 100644
--- a/src/components/settings/settings-nav.tsx
+++ b/src/components/settings/settings-nav.tsx
@@ -9,7 +9,7 @@ export function SettingsNav() {
const pathname = usePathname();
return (
- <aside className="min-h-full border-r border-blue-100/70 px-4 py-10 w-64">
+ <aside className="w-full border-b border-blue-100/70 px-4 py-4 md:min-h-full md:w-64 md:border-b-0 md:border-r md:py-10">
<div className="sticky top-6 space-y-7">
{settingsNavSections.map((section) => (
<div key={section.label} className="space-y-3">
diff --git a/src/components/sidebar-resize-boundary.tsx b/src/components/sidebar-resize-boundary.tsx
index c8d90db..eb1377a 100644
--- a/src/components/sidebar-resize-boundary.tsx
+++ b/src/components/sidebar-resize-boundary.tsx
@@ -10,7 +10,9 @@ export function SidebarResizeBoundary() {
const startWidth = useRef(width);
const resizedWidth = useRef(width);
+ // Hidden on phones, where the sidebar is a fixed icon rail and the handle would swallow touch scrolls.
return (
+ <div className="hidden md:block">
<ResizeHandle
label="Resize left menu"
onResizeStart={() => { startWidth.current = width; resizedWidth.current = width; }}
@@ -21,5 +23,6 @@ export function SidebarResizeBoundary() {
}}
onResizeEnd={() => saveColumnWidth(userId, "sidebar", resizedWidth.current)}
/>
+ </div>
);
}
diff --git a/src/components/sidebar-state.tsx b/src/components/sidebar-state.tsx
index 062a6b8..2bd6b16 100644
--- a/src/components/sidebar-state.tsx
+++ b/src/components/sidebar-state.tsx
@@ -1,9 +1,26 @@
"use client";
-import { createContext, useContext, useEffect, useState } from "react";
+import { usePathname } from "next/navigation";
+import { createContext, useContext, useEffect, useState, useSyncExternalStore } from "react";
import { readColumnWidth } from "./column-width-preferences";
import type { SidebarProviderProps, SidebarState } from "./sidebar-state-types";
+// Below md the sidebar is a 72px icon rail; expanding it overlays the content instead of squeezing it.
+const mobileQuery = "(max-width: 767px)";
+const isMobile = () => window.matchMedia(mobileQuery).matches;
+
+export function useIsMobile() {
+ return useSyncExternalStore(
+ (onChange) => {
+ const media = window.matchMedia(mobileQuery);
+ media.addEventListener("change", onChange);
+ return () => media.removeEventListener("change", onChange);
+ },
+ isMobile,
+ () => false,
+ );
+}
+
const SidebarContext = createContext<SidebarState>({ minimal: false, width: 260, userId: null, toggle: () => undefined, setWidth: () => undefined, setForcedMinimal: () => undefined });
export function SidebarProvider({ children, expandedWidth = 260 }: SidebarProviderProps) {
@@ -12,6 +29,12 @@ export function SidebarProvider({ children, expandedWidth = 260 }: SidebarProvid
const [width, setWidth] = useState(expandedWidth);
const [userId, setUserId] = useState<string | null>(null);
const [storageKey, setStorageKey] = useState<string | null>(null);
+ const pathname = usePathname();
+
+ // Collapse on first load and after every navigation on phones, so the overlay never sticks open.
+ useEffect(() => {
+ if (isMobile()) setMinimal(true);
+ }, [pathname]);
useEffect(() => {
// The sidebar preference is cosmetic, so every failure here degrades to the default.
@@ -28,6 +51,7 @@ export function SidebarProvider({ children, expandedWidth = 260 }: SidebarProvid
setUserId(userId);
const key = `mailflare-sidebar-minimal:${userId}`;
setStorageKey(key);
+ if (isMobile()) return;
try {
setMinimal(localStorage.getItem(key) === "true");
setWidth(readColumnWidth(userId, "sidebar", expandedWidth, 200, 480));
@@ -42,12 +66,12 @@ export function SidebarProvider({ children, expandedWidth = 260 }: SidebarProvid
if (forcedMinimal) {
setForcedMinimal(false);
setMinimal(false);
- if (storageKey) localStorage.setItem(storageKey, "false");
+ if (storageKey && !isMobile()) localStorage.setItem(storageKey, "false");
return;
}
setMinimal((current) => {
const next = !current;
- if (storageKey) localStorage.setItem(storageKey, String(next));
+ if (storageKey && !isMobile()) localStorage.setItem(storageKey, String(next));
return next;
});
}