@bobfrankston/rmfmail 1.2.222 → 1.2.224

package/client/compose/compose.ts

@@ -6,6 +6,7 @@
 
 import { createEditor, type MailxEditor } from "./editor.js";
 import { getVersion, getSettings, getAccounts, searchContacts, sendMessage, saveDraft as apiSaveDraft, deleteDraft, logClientEvent, addPreferredContact, addToDenylist, openInWord, closeWordEdit, onEvent, installConsoleCapture, popoutCompose, consumePopoutComposeInit, closeComposePopout } from "../lib/api-client.js";
+import { runFormatCommand, type EditCommandId } from "./edit-commands.js";
 import { showContextMenu, type MenuItem } from "../components/context-menu.js";
 
 // Capture compose-iframe console + window errors to the daemon log. Same
@@ -2178,77 +2179,6 @@ async function popoutHandoff(): Promise<void> {
 }
 window.addEventListener("compose-popout", () => { void popoutHandoff(); });
 
-// ── Native context-menu clipboard commands ──
-// Chromium drops Cut/Copy from its default context menu whenever the caret is
-// collapsed — and right-clicking a word IS a collapsed caret — so the menu you
-// get while editing has no Cut and no Copy (Bob 2026-08-07). These entries
-// expand to the word under the caret first, matching what the formatting
-// entries already do, and go through the async Clipboard API rather than the
-// deprecated document.execCommand (which needs a user gesture the native menu
-// callback doesn't carry).
-//
-// Clipboard READ is permission-gated in a way write is not, so paste can
-// legitimately be refused. Say so out loud rather than no-op'ing — a menu item
-// that silently does nothing is worse than one that isn't there.
-async function runClipboardCommand(id: "cut" | "copy" | "paste"): Promise<void> {
-    const ne: any = (editor as any)?.nativeEditor;
-    const isTiny = !!ne && typeof ne.execCommand === "function" && !!ne.selection;
-    const label = id === "cut" ? "Cut" : id === "copy" ? "Copy" : "Paste";
-    const shortcut = id === "cut" ? "Ctrl+X" : id === "copy" ? "Ctrl+C" : "Ctrl+V";
-    try {
-        if (id === "paste") {
-            let html = "";
-            let text = "";
-            if (navigator.clipboard?.read) {
-                for (const item of await navigator.clipboard.read()) {
-                    if (item.types.includes("text/html")) html = await (await item.getType("text/html")).text();
-                    if (item.types.includes("text/plain")) text = await (await item.getType("text/plain")).text();
-                }
-            } else {
-                text = await navigator.clipboard.readText();
-            }
-            // Prefer HTML so formatting survives, exactly as Ctrl+V would.
-            // Plain text has to be escaped and line-broken by hand — inserted
-            // raw it would be parsed as markup.
-            const content = html || (text
-                ? text.replace(/[&<>]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" }[c] as string)).replace(/\r?\n/g, "<br>")
-                : "");
-            if (!content) return;
-            if (isTiny) ne.execCommand("mceInsertContent", false, content);
-            else if (ne && typeof ne.getSelection === "function") {
-                const sel = ne.getSelection(true);
-                ne.clipboard?.dangerouslyPasteHTML?.(sel?.index ?? 0, content);
-            } else throw new Error("no editor");
-            return;
-        }
-        // Cut / Copy. Expand a collapsed caret to the word under it so the
-        // command has something to act on.
-        if (isTiny) {
-            try { if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") ne.selection.expand({ type: "word" }); } catch { /* older TinyMCE */ }
-        }
-        const html = isTiny ? ne.selection.getContent({ format: "html" }) : "";
-        const text = isTiny ? ne.selection.getContent({ format: "text" }) : (window.getSelection()?.toString() || "");
-        if (!text && !html) return;
-        if (html && typeof ClipboardItem === "function" && navigator.clipboard?.write) {
-            await navigator.clipboard.write([new ClipboardItem({
-                "text/html": new Blob([html], { type: "text/html" }),
-                "text/plain": new Blob([text], { type: "text/plain" }),
-            })]);
-        } else {
-            await navigator.clipboard.writeText(text);
-        }
-        if (id === "cut") {
-            if (isTiny) ne.execCommand("Delete");
-            else if (ne && typeof ne.deleteText === "function") {
-                const sel = ne.getSelection();
-                if (sel?.length) ne.deleteText(sel.index, sel.length);
-            }
-        }
-    } catch (e: any) {
-        showDraftStatus(`${label} failed: ${e?.message || e}. ${shortcut} still works.`, true);
-    }
-}
-
 // ── Native context-menu app commands ──
 // msger appends app items to the WEBVIEW's native right-click menu (the
 // native menu must stay — Chromium's spellcheck suggestions exist only
@@ -2264,39 +2194,9 @@ async function runClipboardCommand(id: "cut" | "copy" | "paste"): Promise<void>
         try { (editor as any)?.showSource?.(); } catch { /* non-TinyMCE engine */ }
         return;
     }
-    if (id === "cut" || id === "copy" || id === "paste") { void runClipboardCommand(id); return; }
-    const ne: any = (editor as any)?.nativeEditor;
-    if (!ne) return;
-    const isTiny = typeof ne.execCommand === "function" && ne.selection;
-    if (isTiny) {
-        // "On a word" = collapsed caret → expand to the word first.
-        try { if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") ne.selection.expand({ type: "word" }); } catch { /* older TinyMCE */ }
-        const cmd: Record<string, string> = { bold: "Bold", italic: "Italic", underline: "Underline", strike: "Strikethrough", link: "mceLink", clear: "RemoveFormat" };
-        if (cmd[id]) ne.execCommand(cmd[id]);
-        return;
-    }
-    if (typeof ne.format === "function" && typeof ne.getSelection === "function") {
-        // Quill. Expand a collapsed caret to the word under it.
-        let sel = ne.getSelection();
-        if (sel && sel.length === 0) {
-            const text = ne.getText();
-            let a = sel.index, b = sel.index;
-            while (a > 0 && /S/.test(text[a - 1])) a--;
-            while (b < text.length && /S/.test(text[b])) b++;
-            if (b > a) { ne.setSelection(a, b - a); sel = { index: a, length: b - a }; }
-        }
-        if (!sel || sel.length === 0) return;
-        const cur = ne.getFormat(sel);
-        switch (id) {
-            case "bold": ne.format("bold", !cur.bold); break;
-            case "italic": ne.format("italic", !cur.italic); break;
-            case "underline": ne.format("underline", !cur.underline); break;
-            case "strike": ne.format("strike", !cur.strike); break;
-            case "clear": ne.removeFormat(sel.index, sel.length); break;
-            // link: Quill's dialog lives in its keyboard binding — Ctrl+K.
-            case "link": try { ne.root.dispatchEvent(new KeyboardEvent("keydown", { key: "K", ctrlKey: true, bubbles: true, cancelable: true })); } catch { /* */ } break;
-        }
-    }
+    // Everything else is a shared editing command. Same implementation the
+    // spell menus use — one place to fix, so the two menus can't drift.
+    runFormatCommand((editor as any)?.nativeEditor, id as EditCommandId);
 };
 
 // ── Cc / Bcc toggle ──

package/client/compose/edit-commands.js

@@ -0,0 +1,207 @@
+/**
+ * Shared editing commands for compose menus.
+ *
+ * These exist because mailx has THREE right-click menus over the same editor
+ * and they kept drifting apart:
+ *   - msger's native menu, with app items appended (compose.ts dispatches
+ *     them through window.__msgerContextCommand)
+ *   - the TinyMCE spell menu (spellcheck.ts)
+ *   - the Quill spell menu (editor.ts)
+ *
+ * The spell menus call preventDefault and REPLACE the native menu, so a
+ * right-click on a misspelled word — the single most likely right-click in a
+ * draft — produced a menu with spelling actions and nothing else: no Cut, no
+ * Copy, no Paste, no formatting (Bob 2026-08-07, "what happened to all the
+ * previous menu options"). Taking over a menu means taking over ALL of it, so
+ * the commands live here and every menu builds from the same set.
+ *
+ * Engine-agnostic: pass the underlying editor (TinyMCE Editor or Quill). The
+ * TinyMCE and Quill paths differ enough that each command branches, but the
+ * branching happens once, here, instead of in each menu.
+ */
+function isTinyEditor(ne) {
+    return !!ne && typeof ne.execCommand === "function" && !!ne.selection;
+}
+/** Expand a collapsed caret to the word under it, so "right-click a word →
+ *  Copy" (or Bold) acts on that word rather than on nothing. Matches what the
+ *  native-menu formatting items have always done. */
+function expandToWord(ne) {
+    if (isTinyEditor(ne)) {
+        try {
+            if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") {
+                ne.selection.expand({ type: "word" });
+            }
+        }
+        catch { /* older TinyMCE — command still applies at the caret */ }
+        return;
+    }
+    if (ne && typeof ne.getSelection === "function" && typeof ne.setSelection === "function") {
+        const sel = ne.getSelection();
+        if (!sel || sel.length > 0)
+            return;
+        const text = ne.getText();
+        let a = sel.index, b = sel.index;
+        while (a > 0 && /\S/.test(text[a - 1]))
+            a--;
+        while (b < text.length && /\S/.test(text[b]))
+            b++;
+        if (b > a)
+            ne.setSelection(a, b - a);
+    }
+}
+function escapeHtml(s) {
+    return s.replace(/[&<>]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" }[c]));
+}
+/**
+ * Cut / Copy / Paste through the async Clipboard API.
+ *
+ * NOT document.execCommand: that needs transient user activation, which a
+ * native-menu callback (dispatched from Rust via ExecuteScript) does not
+ * carry. Clipboard WRITE is allowed for a focused document; clipboard READ is
+ * permission-gated and can legitimately be refused — which is why this
+ * rejects with a real message instead of returning quietly. Callers surface
+ * it; a menu item that silently does nothing is worse than no menu item.
+ */
+export async function runClipboardCommand(ne, id) {
+    const isTiny = isTinyEditor(ne);
+    if (id === "paste") {
+        let html = "";
+        let text = "";
+        if (navigator.clipboard?.read) {
+            for (const item of await navigator.clipboard.read()) {
+                if (item.types.includes("text/html"))
+                    html = await (await item.getType("text/html")).text();
+                if (item.types.includes("text/plain"))
+                    text = await (await item.getType("text/plain")).text();
+            }
+        }
+        else {
+            text = await navigator.clipboard.readText();
+        }
+        // Prefer HTML so formatting survives, as Ctrl+V would. Plain text has
+        // to be escaped and line-broken by hand or it lands as raw markup.
+        const content = html || (text ? escapeHtml(text).replace(/\r?\n/g, "<br>") : "");
+        if (!content)
+            return;
+        if (isTiny) {
+            ne.execCommand("mceInsertContent", false, content);
+            return;
+        }
+        if (ne?.clipboard?.dangerouslyPasteHTML) {
+            const sel = ne.getSelection(true);
+            ne.clipboard.dangerouslyPasteHTML(sel?.index ?? 0, content);
+            return;
+        }
+        throw new Error("editor doesn't support paste");
+    }
+    expandToWord(ne);
+    let html = "";
+    let text = "";
+    if (isTiny) {
+        html = ne.selection.getContent({ format: "html" });
+        text = ne.selection.getContent({ format: "text" });
+    }
+    else {
+        text = window.getSelection()?.toString() || "";
+    }
+    if (!text && !html)
+        return;
+    if (html && typeof ClipboardItem === "function" && navigator.clipboard?.write) {
+        await navigator.clipboard.write([new ClipboardItem({
+                "text/html": new Blob([html], { type: "text/html" }),
+                "text/plain": new Blob([text], { type: "text/plain" }),
+            })]);
+    }
+    else {
+        await navigator.clipboard.writeText(text);
+    }
+    if (id !== "cut")
+        return;
+    if (isTiny) {
+        ne.execCommand("Delete");
+        return;
+    }
+    if (typeof ne?.deleteText === "function") {
+        const sel = ne.getSelection();
+        if (sel?.length)
+            ne.deleteText(sel.index, sel.length);
+    }
+}
+/** Bold / Italic / Underline / Strikethrough / Link / Clear formatting, acting
+ *  on the selection or, with a collapsed caret, the word under it. */
+export function runFormatCommand(ne, id) {
+    if (!ne)
+        return;
+    expandToWord(ne);
+    if (isTinyEditor(ne)) {
+        const cmd = {
+            bold: "Bold", italic: "Italic", underline: "Underline",
+            strike: "Strikethrough", link: "mceLink", clear: "RemoveFormat",
+        };
+        if (cmd[id])
+            ne.execCommand(cmd[id]);
+        return;
+    }
+    if (typeof ne.format !== "function" || typeof ne.getSelection !== "function")
+        return;
+    const sel = ne.getSelection();
+    if (!sel || sel.length === 0)
+        return;
+    const cur = ne.getFormat(sel);
+    switch (id) {
+        case "bold":
+            ne.format("bold", !cur.bold);
+            break;
+        case "italic":
+            ne.format("italic", !cur.italic);
+            break;
+        case "underline":
+            ne.format("underline", !cur.underline);
+            break;
+        case "strike":
+            ne.format("strike", !cur.strike);
+            break;
+        case "clear":
+            ne.removeFormat(sel.index, sel.length);
+            break;
+        // Quill's link dialog lives in its keyboard binding — Ctrl+K.
+        case "link":
+            try {
+                ne.root.dispatchEvent(new KeyboardEvent("keydown", { key: "K", ctrlKey: true, bubbles: true, cancelable: true }));
+            }
+            catch { /* */ }
+            break;
+    }
+}
+/** The standard editing block appended to any menu that REPLACES the native
+ *  one. `onError` reports a refused clipboard read rather than swallowing it.
+ *  `showSource` is optional — only the TinyMCE path has a source dialog. */
+export function standardEditItems(getEditor, opts = {}) {
+    const report = opts.onError || ((m) => console.warn(`[edit-commands] ${m}`));
+    const clip = (id) => () => {
+        void runClipboardCommand(getEditor(), id).catch((e) => {
+            const key = id === "cut" ? "Ctrl+X" : id === "copy" ? "Ctrl+C" : "Ctrl+V";
+            report(`${id[0].toUpperCase()}${id.slice(1)} failed: ${e?.message || e}. ${key} still works.`);
+        });
+    };
+    const fmt = (id) => () => runFormatCommand(getEditor(), id);
+    const items = [
+        { label: "", action: () => { }, separator: true },
+        { label: "Cut", action: clip("cut") },
+        { label: "Copy", action: clip("copy") },
+        { label: "Paste", action: clip("paste") },
+        { label: "", action: () => { }, separator: true },
+        { label: "Bold", action: fmt("bold") },
+        { label: "Italic", action: fmt("italic") },
+        { label: "Underline", action: fmt("underline") },
+        { label: "Strikethrough", action: fmt("strike") },
+        { label: "Link…", action: fmt("link") },
+        { label: "Clear formatting", action: fmt("clear") },
+    ];
+    if (opts.showSource) {
+        items.push({ label: "", action: () => { }, separator: true });
+        items.push({ label: "View HTML source…", action: opts.showSource });
+    }
+    return items;
+}
+//# sourceMappingURL=edit-commands.js.map

package/client/compose/edit-commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit-commands.js","sourceRoot":"","sources":["edit-commands.ts"],"names":[],"mappings":"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"}

package/client/compose/edit-commands.ts

@@ -0,0 +1,181 @@
+/**
+ * Shared editing commands for compose menus.
+ *
+ * These exist because mailx has THREE right-click menus over the same editor
+ * and they kept drifting apart:
+ *   - msger's native menu, with app items appended (compose.ts dispatches
+ *     them through window.__msgerContextCommand)
+ *   - the TinyMCE spell menu (spellcheck.ts)
+ *   - the Quill spell menu (editor.ts)
+ *
+ * The spell menus call preventDefault and REPLACE the native menu, so a
+ * right-click on a misspelled word — the single most likely right-click in a
+ * draft — produced a menu with spelling actions and nothing else: no Cut, no
+ * Copy, no Paste, no formatting (Bob 2026-08-07, "what happened to all the
+ * previous menu options"). Taking over a menu means taking over ALL of it, so
+ * the commands live here and every menu builds from the same set.
+ *
+ * Engine-agnostic: pass the underlying editor (TinyMCE Editor or Quill). The
+ * TinyMCE and Quill paths differ enough that each command branches, but the
+ * branching happens once, here, instead of in each menu.
+ */
+
+export type EditCommandId = "cut" | "copy" | "paste" | "bold" | "italic" | "underline" | "strike" | "link" | "clear";
+
+function isTinyEditor(ne: any): boolean {
+    return !!ne && typeof ne.execCommand === "function" && !!ne.selection;
+}
+
+/** Expand a collapsed caret to the word under it, so "right-click a word →
+ *  Copy" (or Bold) acts on that word rather than on nothing. Matches what the
+ *  native-menu formatting items have always done. */
+function expandToWord(ne: any): void {
+    if (isTinyEditor(ne)) {
+        try {
+            if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") {
+                ne.selection.expand({ type: "word" });
+            }
+        } catch { /* older TinyMCE — command still applies at the caret */ }
+        return;
+    }
+    if (ne && typeof ne.getSelection === "function" && typeof ne.setSelection === "function") {
+        const sel = ne.getSelection();
+        if (!sel || sel.length > 0) return;
+        const text: string = ne.getText();
+        let a = sel.index, b = sel.index;
+        while (a > 0 && /\S/.test(text[a - 1])) a--;
+        while (b < text.length && /\S/.test(text[b])) b++;
+        if (b > a) ne.setSelection(a, b - a);
+    }
+}
+
+function escapeHtml(s: string): string {
+    return s.replace(/[&<>]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" }[c] as string));
+}
+
+/**
+ * Cut / Copy / Paste through the async Clipboard API.
+ *
+ * NOT document.execCommand: that needs transient user activation, which a
+ * native-menu callback (dispatched from Rust via ExecuteScript) does not
+ * carry. Clipboard WRITE is allowed for a focused document; clipboard READ is
+ * permission-gated and can legitimately be refused — which is why this
+ * rejects with a real message instead of returning quietly. Callers surface
+ * it; a menu item that silently does nothing is worse than no menu item.
+ */
+export async function runClipboardCommand(ne: any, id: "cut" | "copy" | "paste"): Promise<void> {
+    const isTiny = isTinyEditor(ne);
+    if (id === "paste") {
+        let html = "";
+        let text = "";
+        if (navigator.clipboard?.read) {
+            for (const item of await navigator.clipboard.read()) {
+                if (item.types.includes("text/html")) html = await (await item.getType("text/html")).text();
+                if (item.types.includes("text/plain")) text = await (await item.getType("text/plain")).text();
+            }
+        } else {
+            text = await navigator.clipboard.readText();
+        }
+        // Prefer HTML so formatting survives, as Ctrl+V would. Plain text has
+        // to be escaped and line-broken by hand or it lands as raw markup.
+        const content = html || (text ? escapeHtml(text).replace(/\r?\n/g, "<br>") : "");
+        if (!content) return;
+        if (isTiny) { ne.execCommand("mceInsertContent", false, content); return; }
+        if (ne?.clipboard?.dangerouslyPasteHTML) {
+            const sel = ne.getSelection(true);
+            ne.clipboard.dangerouslyPasteHTML(sel?.index ?? 0, content);
+            return;
+        }
+        throw new Error("editor doesn't support paste");
+    }
+
+    expandToWord(ne);
+    let html = "";
+    let text = "";
+    if (isTiny) {
+        html = ne.selection.getContent({ format: "html" });
+        text = ne.selection.getContent({ format: "text" });
+    } else {
+        text = window.getSelection()?.toString() || "";
+    }
+    if (!text && !html) return;
+    if (html && typeof ClipboardItem === "function" && navigator.clipboard?.write) {
+        await navigator.clipboard.write([new ClipboardItem({
+            "text/html": new Blob([html], { type: "text/html" }),
+            "text/plain": new Blob([text], { type: "text/plain" }),
+        })]);
+    } else {
+        await navigator.clipboard.writeText(text);
+    }
+    if (id !== "cut") return;
+    if (isTiny) { ne.execCommand("Delete"); return; }
+    if (typeof ne?.deleteText === "function") {
+        const sel = ne.getSelection();
+        if (sel?.length) ne.deleteText(sel.index, sel.length);
+    }
+}
+
+/** Bold / Italic / Underline / Strikethrough / Link / Clear formatting, acting
+ *  on the selection or, with a collapsed caret, the word under it. */
+export function runFormatCommand(ne: any, id: EditCommandId): void {
+    if (!ne) return;
+    expandToWord(ne);
+    if (isTinyEditor(ne)) {
+        const cmd: Record<string, string> = {
+            bold: "Bold", italic: "Italic", underline: "Underline",
+            strike: "Strikethrough", link: "mceLink", clear: "RemoveFormat",
+        };
+        if (cmd[id]) ne.execCommand(cmd[id]);
+        return;
+    }
+    if (typeof ne.format !== "function" || typeof ne.getSelection !== "function") return;
+    const sel = ne.getSelection();
+    if (!sel || sel.length === 0) return;
+    const cur = ne.getFormat(sel);
+    switch (id) {
+        case "bold": ne.format("bold", !cur.bold); break;
+        case "italic": ne.format("italic", !cur.italic); break;
+        case "underline": ne.format("underline", !cur.underline); break;
+        case "strike": ne.format("strike", !cur.strike); break;
+        case "clear": ne.removeFormat(sel.index, sel.length); break;
+        // Quill's link dialog lives in its keyboard binding — Ctrl+K.
+        case "link":
+            try { ne.root.dispatchEvent(new KeyboardEvent("keydown", { key: "K", ctrlKey: true, bubbles: true, cancelable: true })); } catch { /* */ }
+            break;
+    }
+}
+
+/** The standard editing block appended to any menu that REPLACES the native
+ *  one. `onError` reports a refused clipboard read rather than swallowing it.
+ *  `showSource` is optional — only the TinyMCE path has a source dialog. */
+export function standardEditItems(
+    getEditor: () => any,
+    opts: { onError?: (msg: string) => void; showSource?: () => void } = {},
+): Array<{ label: string; action: () => void; separator?: boolean }> {
+    const report = opts.onError || ((m: string) => console.warn(`[edit-commands] ${m}`));
+    const clip = (id: "cut" | "copy" | "paste") => () => {
+        void runClipboardCommand(getEditor(), id).catch((e: any) => {
+            const key = id === "cut" ? "Ctrl+X" : id === "copy" ? "Ctrl+C" : "Ctrl+V";
+            report(`${id[0].toUpperCase()}${id.slice(1)} failed: ${e?.message || e}. ${key} still works.`);
+        });
+    };
+    const fmt = (id: EditCommandId) => () => runFormatCommand(getEditor(), id);
+    const items: Array<{ label: string; action: () => void; separator?: boolean }> = [
+        { label: "", action: () => { /* */ }, separator: true },
+        { label: "Cut", action: clip("cut") },
+        { label: "Copy", action: clip("copy") },
+        { label: "Paste", action: clip("paste") },
+        { label: "", action: () => { /* */ }, separator: true },
+        { label: "Bold", action: fmt("bold") },
+        { label: "Italic", action: fmt("italic") },
+        { label: "Underline", action: fmt("underline") },
+        { label: "Strikethrough", action: fmt("strike") },
+        { label: "Link…", action: fmt("link") },
+        { label: "Clear formatting", action: fmt("clear") },
+    ];
+    if (opts.showSource) {
+        items.push({ label: "", action: () => { /* */ }, separator: true });
+        items.push({ label: "View HTML source…", action: opts.showSource });
+    }
+    return items;
+}

package/client/compose/editor.js

@@ -343,6 +343,12 @@ function createQuillEditor(container) {
                 label: "Ignore (this session)",
                 action: () => _spellSp.add(word),
             });
+            // Same reasoning as the TinyMCE path in spellcheck.ts: this menu
+            // replaced the native one, so it has to carry the standard editing
+            // commands too, or right-clicking a misspelled word loses Cut,
+            // Copy, Paste and every formatting entry.
+            const { standardEditItems } = await import("./edit-commands.js");
+            items.push(...standardEditItems(() => q));
             core.showSuggestionsMenu(document, e.clientX, e.clientY, items);
         }
         catch (err) {