Email for professionals and teams
improve menu ui
Hieu Nguyen (Jack)3a89c5d7c3ec
diff --git a/src/app/(settings)/layout.tsx b/src/app/(settings)/layout.tsxindex 0fe00a8..75b1d36 100644--- a/src/app/(settings)/layout.tsx+++ b/src/app/(settings)/layout.tsx@@ -23,38 +23,38 @@ export default function DashboardLayout({return (<AuthGuard><SidebarProvider mobileOverlay>- <MailboxProvider>- <ComposeProvider>- <MailSearchProvider>- <ShortcutsProvider>- <div className="grid h-[100dvh] grid-cols-[minmax(0,1fr)] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns]" style={{ transitionDuration: "var(--sidebar-transition-duration)" }}>- <SidebarAside>- <DashboardNav />- </SidebarAside>- <div className="flex min-h-0 min-w-0 flex-col">- <header className="flex h-16 w-full shrink-0 items-center gap-4 pr-4 text-sm">- <MobileMenuButton className="ml-2" />- <MobileBrandIcon />- <MailSearchInput />- {/* <Link+ <MailboxProvider>+ <ComposeProvider>+ <MailSearchProvider>+ <ShortcutsProvider>+ <div className="grid h-[100dvh] grid-cols-[minmax(0,1fr)] md:grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns]" style={{ transitionDuration: "var(--sidebar-transition-duration)" }}>+ <SidebarAside>+ <DashboardNav />+ </SidebarAside>+ <div className="flex min-h-0 min-w-0 flex-col">+ <header className="flex h-16 w-full shrink-0 items-center gap-4 pr-4 text-sm">+ <MobileMenuButton className="ml-2" />+ <MobileBrandIcon />+ <MailSearchInput />+ {/* <Linkhref="/settings/account"className="flex h-10 w-10 items-center justify-center rounded-full text-neutral-600 hover:bg-neutral-200"><HelpCircle className="h-5 w-5" /></Link> */}- <LicenseIndicator />- <MailboxSelector />- </header>- <main className="page-flush min-h-0 flex-1 overflow-y-auto max-md:rounded-t-3xl max-md:bg-white overscroll-contain scrollbar-gutter-stable">- {children}- </main>- </div>- <FloatingComposer />- </div>- </ShortcutsProvider>- </MailSearchProvider>- </ComposeProvider>- </MailboxProvider>+ <LicenseIndicator />+ <MailboxSelector />+ </header>+ <main className="page-flush min-h-0 flex-1 overflow-y-auto max-md:rounded-t-3xl max-md:bg-white overscroll-contain scrollbar-gutter-stable">+ {children}+ </main>+ </div>+ <FloatingComposer />+ </div>+ </ShortcutsProvider>+ </MailSearchProvider>+ </ComposeProvider>+ </MailboxProvider></SidebarProvider></AuthGuard>);diff --git a/src/components/admin-nav.tsx b/src/components/admin-nav.tsxindex 7dfd193..c1d2b99 100644--- a/src/components/admin-nav.tsx+++ b/src/components/admin-nav.tsx@@ -17,8 +17,8 @@ import {import { cn } from "@/lib/utils";import { useCurrentUser } from "@/hooks/use-current-user";import { NavItem } from "./components-nav";+import { NavSectionHeader, useSectionOpen } from "./nav-section-header";import { SidebarFooter } from "./sidebar-footer";-import { useBranding } from "./branding-provider";import { SidebarHeader } from "./sidebar-header";import { SidebarScaffold } from "./sidebar-scaffold";import { useSidebar } from "./sidebar-state";@@ -66,13 +66,30 @@ const sections: { label?: string; links: AdminNavLink[] }[] = [},];+function AdminSection({ label, links, showDivider, minimal }: { label?: string; links: AdminNavLink[]; showDivider: boolean; minimal: boolean }) {+ const [open, toggle] = useSectionOpen(`mailflare:nav:admin-section-open:${label ?? ""}`);+ // Unlabelled sections have nothing to toggle; the icon rail always shows everything.+ const expanded = minimal || !label || open;+ return (+ <section>+ {showDivider && <hr className="mx-6 mb-3 border-neutral-200/70" />}+ {!minimal && label && <NavSectionHeader label={label} open={open} onToggle={toggle} />}+ {expanded && (+ <div className="space-y-px">+ {links.map((link) => (+ <NavItem link={link} key={link.href} />+ ))}+ </div>+ )}+ </section>+ );+}+export function AdminNav({ className }: { className?: string }) {- const branding = useBranding();const { minimal } = useSidebar();const user = useCurrentUser();function canSee(link: AdminNavLink): boolean {- if (link.href === "/branding" && !branding.canCustomizeBranding) return false;if (!link.permission) return true;if (!user) return false;if (link.permission === "primary") return user.isPrimaryAdmin;@@ -89,19 +106,7 @@ export function AdminNav({ className }: { className?: string }) {return (// The first section has no label, so fall back to its first href for a stable key.- <section key={section.label ?? links[0].href}>- {minimal && sectionIndex > 0 && <hr className="mx-6 mb-3 border-neutral-200/70" />}- {!minimal && section.label && (- <p className="mb-1 px-6 text-[11px] font-semibold uppercase tracking-wider text-neutral-400">- {section.label}- </p>- )}- <div className="space-y-1">- {links.map((link) => (- <NavItem link={link} key={link.href} />- ))}- </div>- </section>+ <AdminSection key={section.label ?? links[0].href} label={section.label} links={links} showDivider={minimal && sectionIndex > 0} minimal={minimal} />);})}</div>diff --git a/src/components/components-nav.tsx b/src/components/components-nav.tsxindex c3b77ae..190c690 100644--- a/src/components/components-nav.tsx+++ b/src/components/components-nav.tsx@@ -47,14 +47,15 @@ export function NavItem({ link, iconClassName, labelClassName, wrap }: Props) {if (!Icon) return null;const active = pathname === link.href || pathname.startsWith(`${link.href}/`);const classes = cn(- "flex h-9 items-center gap-3 rounded-r-full text-sm font-medium text-neutral-700 transition-colors max-md:min-h-11 max-md:text-base",+ "flex h-9 items-center gap-3 rounded-r-full text-sm text-neutral-700 transition-colors max-md:min-h-11 max-md:text-base",minimal && "relative mx-auto w-10 justify-center rounded-full px-0",- active ? "bg-blue-100 text-blue-900" : "hover:bg-stone-200/60",+ active ? "bg-blue-100 text-blue-900 font-semibold" : "hover:bg-neutral-200/60",dragOver && "bg-blue-50 text-blue-900 ring-1 ring-blue-200",link.primary &&"mb-3 h-12 w-fit rounded-2xl bg-blue-100 px-5 text-blue-950 shadow-sm hover:bg-blue-200",+ link.count && "font-semibold",link.primary && minimal && "h-11 w-11 rounded-2xl px-0",- wrap && !minimal && "my-0.5 h-auto min-h-9 items-start py-2",+ wrap && !minimal && "h-auto min-h-9 items-start py-2",);const dropProps = link.onMessageDrop? {diff --git a/src/components/dashboard-nav.tsx b/src/components/dashboard-nav.tsxindex dd35434..f782e1e 100644--- a/src/components/dashboard-nav.tsx+++ b/src/components/dashboard-nav.tsx@@ -1,8 +1,8 @@"use client";import type { FormEvent } from "react";-import { Fragment } from "react";import { useEffect, useState } from "react";+import { usePathname } from "next/navigation";import {Archive,Clock,@@ -44,6 +44,9 @@ import {moveMessagesToCustomFolder,moveMessagesToSystemFolder,} from "./dashboard-nav-utils";+import { NavSectionHeader, useSectionOpen } from "./nav-section-header";+import { ReorderableList } from "./reorderable-list";+import { readStorage, writeStorage } from "./reorderable-list-utils";import { SidebarFooter } from "./sidebar-footer";import { SidebarHeader } from "./sidebar-header";import { SidebarScaffold } from "./sidebar-scaffold";@@ -66,8 +69,31 @@ const links = [{ href: "/trash", label: "Trash", icon: Trash2, preloadMessages: true },];+// Drafts, Archived, Spam and Trash start tucked under "More...".+const MORE_LINK_HREFS = ["/drafts", "/archived", "/spam", "/trash"];+const MAX_VISIBLE_FOLDERS = 3;+const MORE_OPEN_KEY = "mailflare:nav:more-open";+const FOLDERS_OPEN_KEY = "mailflare:nav:folders-open";++function NavToggle({ expanded, onClick, collapsedLabel = "More...", expandedLabel = "Show less..." }: { expanded: boolean; onClick: () => void; collapsedLabel?: string; expandedLabel?: string }) {+ return (+ <button+ type="button"+ onClick={onClick}+ aria-expanded={expanded}+ className="flex h-9 w-full items-center rounded-r-full pl-[52px] text-left text-sm text-neutral-700 transition-colors hover:bg-stone-200/60 max-md:min-h-11 max-md:pl-14 max-md:text-base"+ >+ {expanded ? expandedLabel : collapsedLabel}+ </button>+ );+}+export function DashboardNav({ className }: { className?: string }) {const { minimal } = useSidebar();+ const pathname = usePathname();+ const [moreOpen, setMoreOpen] = useState(false);+ const [foldersOpen, setFoldersOpen] = useState(false);+ const [foldersSectionOpen, toggleFoldersSection] = useSectionOpen("mailflare:nav:folders-section-open");const { selectedMailbox, isLoading } = useSelectedMailbox();const { counts } = useMessageCounts(selectedMailbox?.id, !isLoading);const [folders, setFolders] = useState<CustomFolder[]>([]);@@ -119,6 +145,29 @@ export function DashboardNav({ className }: { className?: string }) {return link;});+ useEffect(() => {+ setMoreOpen(readStorage(MORE_OPEN_KEY, false));+ setFoldersOpen(readStorage(FOLDERS_OPEN_KEY, false));+ }, []);++ function toggleMore() {+ writeStorage(MORE_OPEN_KEY, !moreOpen);+ setMoreOpen(!moreOpen);+ }++ function toggleFolders() {+ writeStorage(FOLDERS_OPEN_KEY, !foldersOpen);+ setFoldersOpen(!foldersOpen);+ }++ const isActiveHref = (href: string) => pathname === href || pathname.startsWith(`${href}/`);+ const composeLink = linksWithCounts.find((link) => link.href === "/compose");+ const mainLinks = linksWithCounts.filter((link) => link.href !== "/compose" && !MORE_LINK_HREFS.includes(link.href!));+ const moreLinks = linksWithCounts.filter((link) => MORE_LINK_HREFS.includes(link.href!));+ // The icon rail has no room for text toggles, and a page you are on must stay visible.+ const showMoreLinks = minimal || moreOpen || moreLinks.some((link) => isActiveHref(link.href!));+ const foldersOverflow = !minimal && folders.length > MAX_VISIBLE_FOLDERS;+useEffect(() => {if (!selectedMailbox?.id) {setFolders([]);@@ -173,18 +222,24 @@ export function DashboardNav({ className }: { className?: string }) {return (<SidebarScaffold className={className} header={<SidebarHeader href="/inbox" />} footer={<SidebarFooter />}>- {linksWithCounts.map((link, i) => (- <Fragment key={`nav-${link.href || i}`}>- <NavItem link={link} />- {minimal && i === 0 && <hr className="mx-6 my-2 border-neutral-200/70" />}- </Fragment>- ))}+ {composeLink && <NavItem labelClassName="font-medium" link={composeLink} />}+ {minimal && <hr className="mx-6 my-2 border-neutral-200/70" />}+ <ReorderableList+ storageKey="mailflare:nav:layout"+ enabled={!minimal}+ lists={[+ { id: "main", items: mainLinks.map((link) => ({ id: link.href!, node: <NavItem link={link} /> })) },+ {+ id: "more",+ before: minimal ? undefined : <NavToggle expanded={showMoreLinks} onClick={toggleMore} />,+ hidden: !showMoreLinks,+ items: moreLinks.map((link) => ({ id: link.href!, node: <NavItem link={link} /> })),+ },+ ]}+ />{minimal && <hr className="mx-6 my-2 border-neutral-200/70" />}{!minimal && (- <div className="mt-2 flex h-8 items-center justify-between px-6">- <span className="font-medium tracking-wide text-neutral-900 text-sm max-md:text-base">- Folders- </span>+ <NavSectionHeader label="Folders" open={foldersSectionOpen} onToggle={toggleFoldersSection}>{selectedMailbox && (<Dialog open={folderDialogOpen} onOpenChange={setFolderDialogOpen}><DialogTrigger asChild>@@ -250,29 +305,45 @@ export function DashboardNav({ className }: { className?: string }) {</DialogContent></Dialog>)}- </div>+ </NavSectionHeader>)}- {!minimal && folders.length === 0 && (+ {!minimal && foldersSectionOpen && folders.length === 0 && (<div className="mx-6 rounded-lg border border-dashed border-neutral-200 px-3 py-3 text-xs text-neutral-400">No folders yet</div>)}- {folders.map((folder) => (- <NavItem- key={folder.id}- wrap- link={{- href: `/folders/${folder.id}`,- label: folder.name,- icon: Folder,- preloadMessages: true,- iconColor: folder.color,- count: counts.customFolders[folder.id]?.unread,- onMessageDrop: (messageIds: string[]) =>- void moveMessagesToCustomFolder(messageIds, folder.id),- }}- />- ))}+ {(minimal || foldersSectionOpen) && <ReorderableList+ storageKey="mailflare:nav:layout:folders"+ enabled={!minimal}+ lists={[{+ id: "folders",+ visibleIds: (ordered) => {+ if (!foldersOverflow || foldersOpen) return ordered;+ const first = ordered.slice(0, MAX_VISIBLE_FOLDERS);+ const active = ordered.slice(MAX_VISIBLE_FOLDERS).find((id) => isActiveHref(`/folders/${id}`));+ return active ? [...first, active] : first;+ },+ items: folders.map((folder) => ({+ id: folder.id,+ node: (+ <NavItem+ wrap+ link={{+ href: `/folders/${folder.id}`,+ label: folder.name,+ icon: Folder,+ preloadMessages: true,+ iconColor: folder.color,+ count: counts.customFolders[folder.id]?.unread,+ onMessageDrop: (messageIds: string[]) =>+ void moveMessagesToCustomFolder(messageIds, folder.id),+ }}+ />+ ),+ })),+ }]}+ />}+ {foldersSectionOpen && foldersOverflow && <NavToggle expanded={foldersOpen} onClick={toggleFolders} />}</SidebarScaffold>);}diff --git a/src/components/messages/utils.ts b/src/components/messages/utils.tsindex 37928a6..d73efe9 100644--- a/src/components/messages/utils.ts+++ b/src/components/messages/utils.ts@@ -27,7 +27,7 @@ export function formatRecipientSummary(toAddr: string, firstContactName?: string}export function getMessagePartyClassName(message: Message, folder: MessageFolderConfig["folder"]) {- if (folder === "drafts") return "truncate font-semibold text-red-600";+ if (folder === "drafts") return "truncate font-medium text-red-600";const unread = isMessageListRowUnread(message);return `truncate ${unread ? "font-bold text-neutral-900" : "text-neutral-800"}`;diff --git a/src/components/nav-section-header.tsx b/src/components/nav-section-header.tsxnew file mode 100644index 0000000..93f6b24--- /dev/null+++ b/src/components/nav-section-header.tsx@@ -0,0 +1,30 @@+"use client";++import { useEffect, useState } from "react";+import type { ReactNode } from "react";+import { ChevronDown } from "lucide-react";+import { cn } from "@/lib/utils";+import { readStorage, writeStorage } from "./reorderable-list-utils";++/** Open/closed state of a menu section, remembered in localStorage. Starts open. */+export function useSectionOpen(storageKey: string): [boolean, () => void] {+ const [open, setOpen] = useState(true);+ useEffect(() => { setOpen(readStorage(storageKey, true)); }, [storageKey]);+ function toggle() {+ writeStorage(storageKey, !open);+ setOpen(!open);+ }+ return [open, toggle];+}++export function NavSectionHeader({ label, open, onToggle, children }: { label: string; open: boolean; onToggle: () => void; children?: ReactNode }) {+ return (+ <div className="mt-2 flex h-8 shrink-0 items-center justify-between px-6">+ <button type="button" onClick={onToggle} aria-expanded={open} className="flex items-center gap-1 text-sm font-medium tracking-wide text-neutral-900 max-md:text-base">+ {label}+ <ChevronDown className={cn("h-4 w-4 text-neutral-500 transition-transform", !open && "-rotate-90")} />+ </button>+ {children}+ </div>+ );+}diff --git a/src/components/reorderable-list-types.d.ts b/src/components/reorderable-list-types.d.tsnew file mode 100644index 0000000..b967d2c--- /dev/null+++ b/src/components/reorderable-list-types.d.ts@@ -0,0 +1,47 @@+import type { ReactNode } from "react";++export type ReorderableItem = {+ id: string;+ node: ReactNode;+};++export type ReorderableListSpec = {+ id: string;+ items: ReorderableItem[];+ /** Row rendered above this list (e.g. a "More..." toggle). Dropping on it moves items between this list and the previous one. */+ before?: ReactNode;+ /** Items stay in the layout but are not rendered (a collapsed section). */+ hidden?: boolean;+ /** Narrows the ordered ids down to the ones to render. */+ visibleIds?: (orderedIds: string[]) => string[];+};++export type ReorderableListProps = {+ lists: ReorderableListSpec[];+ /** localStorage key for the saved layout. */+ storageKey: string;+ /** Hold-to-reorder is switched off when false (e.g. the collapsed icon rail). */+ enabled?: boolean;+};++export type ReorderableLayout = Record<string, string[]>;++export type ReorderableDropTarget = {+ listId: string;+ /** Insert before this id; null appends to the list. */+ beforeId: string | null;+ /** Viewport y of the indicator line. */+ lineY: number;+};++export type ReorderableDrag = {+ id: string;+ left: number;+ width: number;+ height: number;+ offsetY: number;+ /** Horizontal extent of the list, for the drop indicator. */+ listLeft: number;+ listWidth: number;+ pointerY: number;+};diff --git a/src/components/reorderable-list-utils.ts b/src/components/reorderable-list-utils.tsnew file mode 100644index 0000000..e500022--- /dev/null+++ b/src/components/reorderable-list-utils.ts@@ -0,0 +1,47 @@+import type { ReorderableLayout } from "./reorderable-list-types";++/**+ * Saved placement first (dropping ids that no longer exist or repeat), then any item the+ * layout has never seen goes at the end of its default list.+ */+export function resolveLayout(defaults: ReorderableLayout, stored: ReorderableLayout): ReorderableLayout {+ const known = new Set(Object.values(defaults).flat());+ const placed = new Set<string>();+ const layout: ReorderableLayout = {};+ for (const listId of Object.keys(defaults)) {+ layout[listId] = (stored[listId] ?? []).filter((id) => known.has(id) && !placed.has(id) && !!placed.add(id));+ }+ for (const [listId, ids] of Object.entries(defaults)) {+ for (const id of ids) if (!placed.has(id)) layout[listId].push(id);+ }+ return layout;+}++/** Take `id` out of whichever list holds it and insert it into `listId` before `beforeId` (end when null). */+export function moveItem(layout: ReorderableLayout, id: string, listId: string, beforeId: string | null): ReorderableLayout {+ const next: ReorderableLayout = {};+ for (const [key, ids] of Object.entries(layout)) next[key] = ids.filter((item) => item !== id);+ const target = next[listId] ?? [];+ const index = beforeId === null ? -1 : target.indexOf(beforeId);+ if (index < 0) target.push(id);+ else target.splice(index, 0, id);+ next[listId] = target;+ return next;+}++export function readStorage<T>(key: string, fallback: T): T {+ try {+ const raw = localStorage.getItem(key);+ return raw === null ? fallback : (JSON.parse(raw) as T);+ } catch {+ return fallback;+ }+}++export function writeStorage(key: string, value: unknown) {+ try {+ localStorage.setItem(key, JSON.stringify(value));+ } catch {+ // Storage can be unavailable (private windows); the setting just won't persist.+ }+}diff --git a/src/components/reorderable-list.tsx b/src/components/reorderable-list.tsxnew file mode 100644index 0000000..504ecaf--- /dev/null+++ b/src/components/reorderable-list.tsx@@ -0,0 +1,158 @@+"use client";++import { useEffect, useRef, useState } from "react";+import type { PointerEvent as ReactPointerEvent } from "react";+import { createPortal } from "react-dom";+import { cn } from "@/lib/utils";+import { moveItem, readStorage, resolveLayout, writeStorage } from "./reorderable-list-utils";+import type { ReorderableDrag, ReorderableDropTarget, ReorderableLayout, ReorderableListProps } from "./reorderable-list-types";++const HOLD_MS = 350;+const CANCEL_DISTANCE = 6;++// Press and hold an item, then drag it. A ghost follows the pointer and a blue line marks where+// it will land; nothing moves until you let go. Lists can hand items to each other through the+// `before` row between them.+export function ReorderableList({ lists, storageKey, enabled = true }: ReorderableListProps) {+ const [stored, setStored] = useState<ReorderableLayout>({});+ const [drag, setDrag] = useState<ReorderableDrag | null>(null);+ const [target, setTarget] = useState<ReorderableDropTarget | null>(null);+ const containerRef = useRef<HTMLDivElement | null>(null);+ const hold = useRef<{ timer: number; x: number; y: number } | null>(null);+ const suppressClick = useRef(false);+ const latest = useRef({ layout: {} as ReorderableLayout, target: null as ReorderableDropTarget | null });++ useEffect(() => { setStored(readStorage<ReorderableLayout>(storageKey, {})); }, [storageKey]);++ const layout = resolveLayout(Object.fromEntries(lists.map((list) => [list.id, list.items.map((item) => item.id)])), stored);+ const nodes = new Map(lists.flatMap((list) => list.items.map((item) => [item.id, item.node] as const)));+ useEffect(() => { latest.current.layout = layout; latest.current.target = target; });++ const dragId = drag?.id ?? null;+ useEffect(() => {+ if (!dragId) return;+ const container = containerRef.current;+ if (!container) return;++ function locate(y: number): ReorderableDropTarget | null {+ const rows = Array.from(container!.querySelectorAll<HTMLElement>("[data-reorder-id], [data-reorder-boundary]"));+ if (rows.length === 0) return null;+ const current = latest.current.layout;+ const hit = rows.find((row) => { const rect = row.getBoundingClientRect(); return y >= rect.top && y <= rect.bottom; })+ ?? (y < rows[0].getBoundingClientRect().top ? rows[0] : rows[rows.length - 1]);+ const rect = hit.getBoundingClientRect();+ const upper = y < rect.top + rect.height / 2 || (y < rect.top);+ const boundaryList = hit.dataset.reorderBoundary;+ if (boundaryList !== undefined) {+ const listIds = Object.keys(current);+ const index = listIds.indexOf(boundaryList);+ if (upper) return { listId: listIds[Math.max(0, index - 1)], beforeId: null, lineY: rect.top };+ return { listId: boundaryList, beforeId: current[boundaryList]?.[0] ?? null, lineY: rect.bottom };+ }+ const id = hit.dataset.reorderId!;+ const listId = hit.dataset.reorderList!;+ if (upper) return { listId, beforeId: id, lineY: rect.top };+ const ids = current[listId];+ return { listId, beforeId: ids[ids.indexOf(id) + 1] ?? null, lineY: rect.bottom };+ }++ const onMove = (event: PointerEvent) => {+ setDrag((current) => current && { ...current, pointerY: event.clientY });+ const next = locate(event.clientY);+ setTarget((current) => current && next && current.listId === next.listId && current.beforeId === next.beforeId && current.lineY === next.lineY ? current : next);+ };+ const end = (commit: boolean) => {+ suppressClick.current = true;+ window.setTimeout(() => { suppressClick.current = false; }, 0);+ const drop = latest.current.target;+ if (commit && drop) {+ const next = moveItem(latest.current.layout, dragId, drop.listId, drop.beforeId);+ setStored(next);+ writeStorage(storageKey, next);+ }+ setDrag(null);+ setTarget(null);+ };+ const onUp = () => end(true);+ const onCancel = () => end(false);+ const onKey = (event: KeyboardEvent) => { if (event.key === "Escape") end(false); };+ // Once holding, a touch drag must not scroll the menu.+ const blockScroll = (event: TouchEvent) => event.preventDefault();+ window.addEventListener("pointermove", onMove);+ window.addEventListener("pointerup", onUp);+ window.addEventListener("pointercancel", onCancel);+ window.addEventListener("keydown", onKey);+ document.addEventListener("touchmove", blockScroll, { passive: false });+ return () => {+ window.removeEventListener("pointermove", onMove);+ window.removeEventListener("pointerup", onUp);+ window.removeEventListener("pointercancel", onCancel);+ window.removeEventListener("keydown", onKey);+ document.removeEventListener("touchmove", blockScroll);+ };+ }, [dragId, storageKey]);++ useEffect(() => () => { if (hold.current) window.clearTimeout(hold.current.timer); }, []);++ function cancelHold() {+ if (!hold.current) return;+ window.clearTimeout(hold.current.timer);+ hold.current = null;+ }++ function startHold(event: ReactPointerEvent<HTMLDivElement>, id: string) {+ if (!enabled || event.button !== 0) return;+ cancelHold();+ const element = event.currentTarget;+ const { clientX, clientY } = event;+ const timer = window.setTimeout(() => {+ hold.current = null;+ const rect = element.getBoundingClientRect();+ const listRect = containerRef.current?.getBoundingClientRect();+ setDrag({ id, left: rect.left, width: rect.width, height: rect.height, offsetY: clientY - rect.top, pointerY: clientY, listLeft: listRect?.left ?? rect.left, listWidth: listRect?.width ?? rect.width });+ }, HOLD_MS);+ hold.current = { timer, x: clientX, y: clientY };+ }++ function moveHold(event: ReactPointerEvent) {+ const current = hold.current;+ if (current && Math.hypot(event.clientX - current.x, event.clientY - current.y) > CANCEL_DISTANCE) cancelHold();+ }++ return (+ <div ref={containerRef} className={cn("flex shrink-0 flex-col gap-px", drag && "select-none")}>+ {lists.map((list) => {+ const ordered = layout[list.id] ?? [];+ const shown = list.hidden ? [] : list.visibleIds ? list.visibleIds(ordered) : ordered;+ return (+ <div key={list.id} className="contents">+ {list.before && <div data-reorder-boundary={list.id}>{list.before}</div>}+ {shown.map((id) => (+ <div key={id} data-reorder-id={id} data-reorder-list={list.id}+ onPointerDown={(event) => startHold(event, id)}+ onPointerMove={moveHold}+ onPointerUp={cancelHold}+ onPointerCancel={cancelHold}+ onDragStart={(event) => event.preventDefault()}+ onContextMenu={(event) => { if (hold.current || drag) event.preventDefault(); }}+ onClickCapture={(event) => { if (suppressClick.current) { event.preventDefault(); event.stopPropagation(); } }}+ className={cn("shrink-0", dragId === id && "opacity-40")}>+ {nodes.get(id)}+ </div>+ ))}+ </div>+ );+ })}+ {drag && target && createPortal(+ <div aria-hidden="true" className="pointer-events-none fixed z-[300] h-0.5 rounded-full bg-blue-600" style={{ left: drag.listLeft, width: drag.listWidth, top: target.lineY - 1 }} />,+ document.body,+ )}+ {drag && createPortal(+ <div aria-hidden="true" className="pointer-events-none fixed z-[301] cursor-grabbing overflow-hidden rounded-r-full bg-white opacity-90 shadow-lg ring-1 ring-neutral-200" style={{ left: drag.left, width: drag.width, top: drag.pointerY - drag.offsetY }}>+ {nodes.get(drag.id)}+ </div>,+ document.body,+ )}+ </div>+ );+}diff --git a/src/components/sidebar-scaffold.tsx b/src/components/sidebar-scaffold.tsxindex 51b203c..ae752d1 100644--- a/src/components/sidebar-scaffold.tsx+++ b/src/components/sidebar-scaffold.tsx@@ -9,7 +9,7 @@ export function SidebarScaffold({ header, footer, children, className }: Sidebarreturn (<nav className={cn("flex h-full min-h-0 flex-col", className)}><div className="shrink-0 px-3 pt-4">{header}</div>- <div className={cn("flex min-h-0 flex-1 flex-col gap-1 overflow-y-auto [&>*]:shrink-0 overscroll-contain py-3", minimal ? "px-3" : "pr-3", "[scrollbar-gutter:stable] [mask-image:linear-gradient(to_bottom,transparent,black_12px,black_calc(100%-12px),transparent)]")}>+ <div className={cn("flex min-h-0 flex-1 flex-col gap-px overflow-y-auto [&>*]:shrink-0 overscroll-contain py-3", minimal ? "px-3" : "pr-3", "[scrollbar-gutter:stable] [mask-image:linear-gradient(to_bottom,transparent,black_12px,black_calc(100%-12px),transparent)]")}>{children}</div>{footer && <div className="shrink-0 px-3 pb-3">{footer}</div>}