@rapidmx/web-client 0.27.0 → 0.29.0

package/apps/shared/components/mail/labelMenu.tsx

@@ -219,6 +219,8 @@ export interface LabelMenuButtonProps extends Omit<LabelSectionsOptions, "state"
     disabled?: boolean;
     title?: string;
     className?: string;
+    /** The trigger is just its icon (`className` then styles all of it) - `aria-label` and `title` name it. */
+    iconOnly?: boolean;
     /** With `onLabelCreated`, adds a "New label" row that opens this component's own dialog. */
     mailboxUid?: string;
     onLabelCreated?: (label: Label) => void;
@@ -240,6 +242,7 @@ export default function LabelMenuButton({
     disabled,
     title,
     className,
+    iconOnly,
     mailboxUid,
     onLabelCreated,
 }: LabelMenuButtonProps) {
@@ -255,6 +258,7 @@ export default function LabelMenuButton({
             disabled={disabled}
             title={title}
             className={className}
+            iconOnly={iconOnly}
             onOpenChange={setOpen}
             sections={labelSections({
                 labels,

package/apps/shared/components/mail/layout/MailShell.tsx

@@ -42,6 +42,13 @@ import { useShortcut } from "../../../keyboard/useShortcut.js";
 
 export type MailShellProps = Omit<AppShellProps, "active">;
 
+/**
+ * From `md` up the sidebar and the content beside it are each exactly as tall as the window under the title bar, so each scrolls by itself (the frame's
+ * own height is open-ended - `min-h-screen` - so a column's `overflow` would otherwise never apply and the whole page would scroll instead). On a phone
+ * the page scrolls as a whole, as it always did. The same height the Contacts page uses; `--rr-header-h` is the title bar's (or branding header's) height.
+ */
+const DESKTOP_PANE_HEIGHT = "md:h-[calc(100dvh_-_var(--rr-header-h,4rem))]";
+
 /** One mailbox's own mail folders (already filtered to `MAIL_FOLDER_TYPES` and unsorted) - one entry per
  * mailbox in `mailboxes`, fetched in parallel so every accessible mailbox's folder tree can render
  * simultaneously (see `MailShell`'s own doc comment on why this replaced the old single-mailbox `folders`
@@ -485,11 +492,11 @@ export default function MailShell({
         inner = (
             <>
                 <MailShortcuts mailboxUid={defaultMailboxUid} />
-                <aside className="hidden md:flex w-64 shrink-0 bg-surface border-r border-border flex-col">{sidebarContent("desktop")}</aside>
+                <aside className={["hidden md:flex w-64 shrink-0 bg-surface border-r border-border flex-col", DESKTOP_PANE_HEIGHT].join(" ")}>{sidebarContent("desktop")}</aside>
                 <Drawer open={drawerOpen} onClose={() => setDrawerOpen(false)} title="Folders" fullScreen>
                     <div className="flex flex-col">{sidebarContent("mobile")}</div>
                 </Drawer>
-                <main className="flex-1 min-w-0 overflow-y-auto">
+                <main className={["flex-1 min-w-0 overflow-y-auto", DESKTOP_PANE_HEIGHT].join(" ")}>
                     <div className="md:hidden flex items-center gap-2 p-3">
                         <button
                             type="button"

package/apps/shared/components/mail/reading/MessageBody.tsx

@@ -156,7 +156,7 @@ function HtmlBody({
     const theme = useResolvedTheme();
     const surface = useThemeSurface(theme);
     // Keyed on what the resolver reads rather than on the arrays, which a caller may rebuild on every render.
-    const inlineKey = [...(attachments ?? []).map((a) => `${a.uid}:${(a as { contentId?: string }).contentId ?? ""}`), inlineParts ? `parts:${inlineParts.length}` : ""].join("|");
+    const inlineKey = [...(attachments ?? []).map((a) => `${a.uid}:${(a as { contentId?: string }).contentId ?? ""}:${a.filename}:${a.mimeType}`), inlineParts ? `parts:${inlineParts.length}` : ""].join("|");
     const resolveCid = useMemo(() => makeCidResolver(attachments, inlineParts), [inlineKey]);
     const prepared = useMemo(() => prepareBodyHtml(html, { resolveCid }), [html, resolveCid]);
     const mode: FrameMode = prepared.declaresDarkSupport ? "native" : original ? "original" : "adapt";

package/apps/shared/components/mail/reading/bodyContent.ts

@@ -5,6 +5,7 @@
 import { ApiRequestError, apiUrl } from "../../../../../lib/util/api.js";
 import { Attachment, attachmentContentUrl } from "../../../../../lib/mail/mailApi.js";
 import type { MimeAttachment } from "../../../../../lib/crypto/mime.js";
+import { bytesToBase64, findInlineAttachment, toDataUri } from "../../../../../lib/mail/inlineImages.js";
 
 /** What a message's body is: server-sanitized HTML, or plain text (a message with no HTML part, or the server's plain-text fallback). */
 export type BodyContent = { kind: "html"; html: string } | { kind: "text"; text: string };
@@ -61,14 +62,6 @@ export async function fetchBodyContent(uid: string, version: number, signal?: Ab
 export const MAX_INLINE_IMAGE_BYTES = 5_000_000;
 const INLINE_IMAGE_TYPES = /^image\/(?:png|jpe?g|gif|webp|avif|bmp|svg\+xml)$/;
 
-function base64(bytes: Uint8Array): string {
-    let binary = "";
-    for (let i = 0; i < bytes.length; i += 0x8000) {
-        binary += String.fromCharCode(...bytes.subarray(i, i + 0x8000));
-    }
-    return btoa(binary);
-}
-
 /** A server attachment record as it may really arrive: the model carries the part's `Content-ID`, though the client type doesn't list it. */
 export type InlineCapable = Attachment & { contentId?: string };
 
@@ -86,15 +79,24 @@ export function attachmentSource(): string {
  * How an inline `cid:` image is resolved to something the frame may load: for a message shown from the server, the attachment whose
  * `Content-ID` matches (its URL on this server); for a decrypted or verified one, the part inside the signed/encrypted entity, embedded
  * as a `data:` URI (raster and SVG images up to `MAX_INLINE_IMAGE_BYTES`). Anything else has no source, so the image is not shown.
+ *
+ * The `Content-ID` is matched without regard to angle brackets, percent-encoding or case. An image that names no part (`contentId`
+ * undefined: the server left it with only its `alt`, as it does for a picture a sender attached without a `Content-ID`) is matched to the
+ * one image attachment of the same file name, when `alt` says it.
  */
-export function makeCidResolver(attachments: InlineCapable[] | undefined, parts: MimeAttachment[] | undefined): (contentId: string) => string | undefined {
-    return (contentId) => {
+export function makeCidResolver(
+    attachments: InlineCapable[] | undefined,
+    parts: MimeAttachment[] | undefined,
+): (contentId: string | undefined, alt?: string) => string | undefined {
+    return (contentId, alt) => {
         if (parts) {
-            const part = parts.find((candidate) => candidate.contentId === contentId);
+            const candidates = parts.map((part, index) => ({ uid: String(index), filename: part.filename ?? "", mimeType: part.contentType, contentId: part.contentId }));
+            const found = findInlineAttachment(candidates, { cid: contentId, alt });
+            const part = found ? parts[Number(found.uid)] : undefined;
             const bytes = part && INLINE_IMAGE_TYPES.test(part.contentType) ? part.decode() : undefined;
-            return part && bytes && bytes.length <= MAX_INLINE_IMAGE_BYTES ? `data:${part.contentType};base64,${base64(bytes)}` : undefined;
+            return part && bytes && bytes.length <= MAX_INLINE_IMAGE_BYTES ? toDataUri(part.contentType, bytes) : undefined;
         }
-        const attachment = attachments?.find((candidate) => candidate.contentId === contentId);
+        const attachment = findInlineAttachment(attachments, { cid: contentId, alt });
         return attachment ? absoluteAttachmentUrl(attachment.uid) : undefined;
     };
 }

package/apps/shared/components/mail/reading/bodyHtml.ts

@@ -39,8 +39,9 @@ export interface PreparedBody {
 
 export interface PrepareOptions {
     /** The URL an inline image's `cid:` reference stands for, or `undefined` when there is no such part. Only `data:` URIs of an
-     * image type and `http(s)` URLs are accepted; anything else is treated as unresolved. */
-    resolveCid?: (contentId: string) => string | undefined;
+     * image type and `http(s)` URLs are accepted; anything else is treated as unresolved. An image with no source at all (the
+     * server removes one it could not point at a part) is asked for with no `contentId` and its `alt`. */
+    resolveCid?: (contentId: string | undefined, alt?: string) => string | undefined;
 }
 
 /** What a stylesheet or a `style` attribute may not contain, whatever the sanitizers before it did. */
@@ -222,10 +223,14 @@ function hardenLink(element: Element): void {
     }
 }
 
-function hardenImage(element: Element, options: PrepareOptions): void {
+/** Whether the image ends up pointing at a part of the message (so the frame's CSP must allow this server's attachment URLs). */
+function hardenImage(element: Element, options: PrepareOptions): boolean {
     const src = (element.getAttribute("src") ?? "").trim();
-    const inline = /^cid:/i.test(src);
-    const target = inline ? options.resolveCid?.(src.slice(4).replace(/^<|>$/g, "")) : src;
+    const cid = /^cid:/i.test(src);
+    // A picture the server could not tie to a part keeps its `alt` and loses its `src`: the message's own attachment of that name, if any.
+    const inline = cid || src === "";
+    const alt = element.getAttribute("alt") ?? undefined;
+    const target = cid ? options.resolveCid?.(src.slice(4).replace(/^<|>$/g, ""), alt) : inline ? options.resolveCid?.(undefined, alt) : src;
     // Remote images are never fetched (they would tell the sender the message was read); an inline image resolves to an embedded
     // image or to this server's own attachment URL, and one that doesn't resolve has nothing to show.
     if (target !== undefined && (IMAGE_DATA_URI.test(target) || (inline && /^https?:\/\//i.test(target)))) {
@@ -233,6 +238,7 @@ function hardenImage(element: Element, options: PrepareOptions): void {
     } else {
         element.removeAttribute("src");
     }
+    return cid || (inline && element.hasAttribute("src"));
 }
 
 /**
@@ -265,10 +271,9 @@ function harden(body: HTMLElement, options: PrepareOptions): { elements: number;
         } else if (tag === "a" || tag === "area") {
             hardenLink(element);
         } else if (tag === "img") {
-            if (/^cid:/i.test(element.getAttribute("src") ?? "")) {
+            if (hardenImage(element, options)) {
                 inlineImages++;
             }
-            hardenImage(element, options);
         }
     }
     return { elements: all.length, inlineImages };

package/apps/shared/gestures/useEnterSlide.ts

@@ -13,7 +13,7 @@ const ENTER_START_OPACITY = 0.35;
 const ENTER_SETTLE_MS = 20;
 
 /** Whether the user asked their device for less motion. */
-function prefersReducedMotion(): boolean {
+export function prefersReducedMotion(): boolean {
     return typeof window !== "undefined" && typeof window.matchMedia === "function" && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
 }
 

package/apps/shared/keyboard/keymap.ts

@@ -95,6 +95,8 @@ export const SHORTCUTS = {
         workWeek: def({ id: "calendar.workWeek", keys: ["ctrl+alt+2"], label: "Work week view", scope: "calendar" }),
         week: def({ id: "calendar.week", keys: ["ctrl+alt+3"], label: "Week view", scope: "calendar" }),
         month: def({ id: "calendar.month", keys: ["ctrl+alt+4"], label: "Month view", scope: "calendar" }),
+        list: def({ id: "calendar.list", keys: ["ctrl+alt+5"], label: "List view", scope: "calendar" }),
+        search: def({ id: "calendar.search", keys: ["/", "mod+e"], label: "Search events", scope: "calendar" }),
     },
     contacts: {
         create: def({ id: "contacts.new", keys: ["alt+n"], electronKeys: ["mod+n"], label: "New contact", scope: "contacts" }),

package/apps/shared/mail/rangeSelection.ts

@@ -0,0 +1,45 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+
+/** The modifier keys of a click - what a mouse event, or the native event behind a checkbox's change, carries. */
+export interface ClickModifiers {
+    shiftKey?: boolean;
+    ctrlKey?: boolean;
+    metaKey?: boolean;
+}
+
+/** Whether a click is a multi-select click (Shift, Ctrl, or Cmd on a Mac) rather than the plain click that opens a row. */
+export function isSelectionClick(modifiers: ClickModifiers | undefined): boolean {
+    return !!modifiers && !!(modifiers.shiftKey || modifiers.ctrlKey || modifiers.metaKey);
+}
+
+/** Ctrl (or Cmd on a Mac): toggle just the clicked row. */
+export function isToggleClick(modifiers: ClickModifiers | undefined): boolean {
+    return !!modifiers && !!(modifiers.ctrlKey || modifiers.metaKey);
+}
+
+/**
+ * The anchor of a Shift+click range, as Explorer and Outlook have it: the row last clicked (or opened) - `anchor` - while it is still in
+ * the list, else the row open in the reading pane (`open`), else nothing (the range is then just the clicked row).
+ */
+export function resolveAnchor(keys: readonly string[], anchor: string | null, open: string | null): string | null {
+    if (anchor !== null && keys.includes(anchor)) {
+        return anchor;
+    }
+    return open !== null && keys.includes(open) ? open : null;
+}
+
+/**
+ * Every key from `anchor` to `target` inclusive, in the order `keys` has them - the order the list is displayed in, whichever end of the
+ * range was clicked first. With no usable anchor the range is `target` alone.
+ */
+export function rangeBetween(keys: readonly string[], anchor: string | null, target: string): string[] {
+    const from = anchor === null ? -1 : keys.indexOf(anchor);
+    const to = keys.indexOf(target);
+    if (from === -1 || to === -1) {
+        return [target];
+    }
+    return keys.slice(Math.min(from, to), Math.max(from, to) + 1);
+}

package/apps/shared/mail/rowExit.ts

@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+
+/** How long a row that leaves the list (moved, deleted, archived) takes to collapse. The list drops it from its data after this long. */
+export const ROW_EXIT_MS = 200;
+
+/**
+ * Whether a row that leaves should collapse rather than vanish: the browser can animate an element (`Element.animate()` - every current one
+ * can) and the reader has not asked for less motion (`prefers-reduced-motion`). Otherwise the row is removed at once.
+ */
+export function canAnimateRowExit(): boolean {
+    // Only called from event handlers, i.e. in a browser.
+    if (typeof Element.prototype.animate !== "function") {
+        return false;
+    }
+    return !(typeof window.matchMedia === "function" && window.matchMedia("(prefers-reduced-motion: reduce)").matches);
+}
+
+/**
+ * Collapses a row that is leaving: its height and opacity run to zero over `ROW_EXIT_MS`, so the rows below slide up into the gap, and it
+ * stays collapsed (`fill: forwards`) until the list drops it. The row is marked so a second call for the same element does nothing.
+ */
+export function collapseRow(row: HTMLElement): void {
+    if (row.dataset.collapsing) {
+        return;
+    }
+    row.dataset.collapsing = "true";
+    const height = row.getBoundingClientRect().height;
+    row.style.overflow = "hidden";
+    row.animate(
+        [
+            { height: `${height}px`, opacity: 1 },
+            { height: "0px", opacity: 0, borderBottomWidth: "0px" },
+        ],
+        { duration: ROW_EXIT_MS, easing: "ease-out", fill: "forwards" },
+    );
+}

package/apps/shared/mail/usePermanentDelete.tsx

@@ -23,6 +23,8 @@ import {
 export interface EmptiableFolder {
     uid: string;
     name: string;
+    /** Every folder to empty, when "the folder" is the "All mailboxes" view of one type (each mailbox's own Deleted Items): `uid` is then the first of them. */
+    uids?: string[];
 }
 
 export interface PermanentDelete {
@@ -113,13 +115,18 @@ export function usePermanentDelete(): PermanentDelete {
             finish(outcome);
             return;
         }
-        let outcome: EmptyFolderOutcome;
-        try {
-            outcome = await purgeFolder(request.folder.uid, undefined, client);
-        } catch (err) {
-            notifyApiError(err, `Couldn't empty ${request.folder.name}`);
-            // Part of it may have gone before the failure: the caller reloads rather than assume nothing did.
-            outcome = { emptied: false, deleted: [], failed: [] };
+        const outcome: EmptyFolderOutcome = { emptied: true, deleted: [], failed: [] };
+        for (const folderUid of request.folder.uids ?? [request.folder.uid]) {
+            try {
+                const one = await purgeFolder(folderUid, undefined, client);
+                outcome.emptied &&= one.emptied;
+                outcome.deleted.push(...one.deleted);
+                outcome.failed.push(...one.failed);
+            } catch (err) {
+                notifyApiError(err, `Couldn't empty ${request.folder.name}`);
+                // Part of it may have gone before the failure: the caller reloads rather than assume nothing did.
+                outcome.emptied = false;
+            }
         }
         afterDeleted(outcome.deleted);
         // The whole-folder request does not say which messages went, so the counts are read back rather than adjusted.