@bobfrankston/rmfmail 1.2.222 → 1.2.224

package/client/compose/compose.bundle.js

@@ -1303,8 +1303,8 @@ function hasBccHistoryTo(email) {
 function listContacts(query, page = 1, pageSize = 100) {
   return ipc().listContacts(query, page, pageSize);
 }
-function upsertContact(name, email) {
-  return ipc().upsertContact(name, email);
+function upsertContact(name, email, fields) {
+  return ipc().upsertContact(name, email, fields);
 }
 function deleteContact(email) {
   return ipc().deleteContact(email);
@@ -1983,6 +1983,188 @@ var init_spellcheck_core = __esm({
   }
 });
 
+// client/compose/edit-commands.js
+var edit_commands_exports = {};
+__export(edit_commands_exports, {
+  runClipboardCommand: () => runClipboardCommand,
+  runFormatCommand: () => runFormatCommand,
+  standardEditItems: () => standardEditItems
+});
+function isTinyEditor(ne) {
+  return !!ne && typeof ne.execCommand === "function" && !!ne.selection;
+}
+function expandToWord(ne) {
+  if (isTinyEditor(ne)) {
+    try {
+      if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") {
+        ne.selection.expand({ type: "word" });
+      }
+    } catch {
+    }
+    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]);
+}
+async function runClipboardCommand(ne, id) {
+  const isTiny = isTinyEditor(ne);
+  if (id === "paste") {
+    let html2 = "";
+    let text2 = "";
+    if (navigator.clipboard?.read) {
+      for (const item of await navigator.clipboard.read()) {
+        if (item.types.includes("text/html"))
+          html2 = await (await item.getType("text/html")).text();
+        if (item.types.includes("text/plain"))
+          text2 = await (await item.getType("text/plain")).text();
+      }
+    } else {
+      text2 = await navigator.clipboard.readText();
+    }
+    const content = html2 || (text2 ? escapeHtml(text2).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);
+  }
+}
+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;
+  }
+}
+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\u2026", action: fmt("link") },
+    { label: "Clear formatting", action: fmt("clear") }
+  ];
+  if (opts.showSource) {
+    items.push({ label: "", action: () => {
+    }, separator: true });
+    items.push({ label: "View HTML source\u2026", action: opts.showSource });
+  }
+  return items;
+}
+var init_edit_commands = __esm({
+  "client/compose/edit-commands.js"() {
+    "use strict";
+  }
+});
+
 // client/lib/rmf-tiny.js
 var rmf_tiny_exports = {};
 __export(rmf_tiny_exports, {
@@ -2937,6 +3119,21 @@ function wireSpellcheck(editor2) {
         scheduleScan();
       }
     });
+    items.push(...standardEditItems(() => editor2, {
+      onError: (msg) => {
+        try {
+          editor2.notificationManager?.open({ text: msg, type: "error", timeout: 6e3 });
+        } catch {
+          console.warn(msg);
+        }
+      },
+      showSource: () => {
+        try {
+          editor2.execCommand("mceCodeEditor");
+        } catch {
+        }
+      }
+    }));
     const iframeEl = editor2.iframeElement;
     const rect = iframeEl ? iframeEl.getBoundingClientRect() : { left: 0, top: 0 };
     showSuggestionsMenu(document, rect.left + e.clientX, rect.top + e.clientY, items, [iframeDoc]);
@@ -2947,6 +3144,7 @@ var init_spellcheck = __esm({
   "client/compose/spellcheck.js"() {
     "use strict";
     init_spellcheck_core();
+    init_edit_commands();
     SCAN_DEBOUNCE_MS = 600;
     WAVE = `url("data:image/svg+xml,${encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" width="6" height="3"><path d="M0 2 Q1.5 0 3 2 T6 2" stroke="#d33" fill="none" stroke-width="1"/></svg>')}")`;
     OVERLAY_ID = "mailx-spell-overlay";
@@ -3941,6 +4139,8 @@ function createQuillEditor(container2) {
         label: "Ignore (this session)",
         action: () => _spellSp.add(word)
       });
+      const { standardEditItems: standardEditItems2 } = await Promise.resolve().then(() => (init_edit_commands(), edit_commands_exports));
+      items.push(...standardEditItems2(() => q));
       core.showSuggestionsMenu(document, e.clientX, e.clientY, items);
     } catch (err) {
       console.warn("[spellcheck] right-click handler error:", err?.message || err);
@@ -4417,12 +4617,21 @@ async function createTinyMceEditor2(container2, opts = {}) {
 
 // client/compose/compose.ts
 init_api_client();
+init_edit_commands();
 
 // client/components/context-menu.js
 var activeMenu = null;
 var dismissListener = null;
 var escapeListener = null;
+var activeSubmenu = null;
+function closeSubmenu() {
+  if (activeSubmenu) {
+    activeSubmenu.remove();
+    activeSubmenu = null;
+  }
+}
 function closeContextMenu() {
+  closeSubmenu();
   if (activeMenu) {
     activeMenu.remove();
     activeMenu = null;
@@ -4436,6 +4645,45 @@ function closeContextMenu() {
     escapeListener = null;
   }
 }
+function openSubmenu(parentRow, items) {
+  closeSubmenu();
+  const sub = document.createElement("div");
+  sub.className = "ctx-menu";
+  for (const item of items) {
+    if (item.separator) {
+      const sep = document.createElement("div");
+      sep.className = "ctx-sep";
+      sub.appendChild(sep);
+      continue;
+    }
+    const el = document.createElement("div");
+    el.className = "ctx-item" + (item.disabled ? " ctx-disabled" : "");
+    el.textContent = item.label;
+    if (item.tooltip)
+      el.title = item.tooltip;
+    if (!item.disabled) {
+      el.addEventListener("click", () => {
+        closeContextMenu();
+        item.action();
+      });
+    }
+    sub.appendChild(el);
+  }
+  document.body.appendChild(sub);
+  const anchor = parentRow.getBoundingClientRect();
+  const vw = window.visualViewport?.width ?? window.innerWidth;
+  const vh = window.visualViewport?.height ?? window.innerHeight;
+  const rect = sub.getBoundingClientRect();
+  let left = anchor.right - 2;
+  if (left + rect.width > vw)
+    left = anchor.left - rect.width + 2;
+  let top = anchor.top;
+  if (top + rect.height > vh)
+    top = vh - rect.height - 4;
+  sub.style.left = `${Math.max(4, left)}px`;
+  sub.style.top = `${Math.max(4, top)}px`;
+  activeSubmenu = sub;
+}
 function showContextMenu(x, y, items) {
   closeContextMenu();
   const menu = document.createElement("div");
@@ -4454,6 +4702,24 @@ function showContextMenu(x, y, items) {
     el.textContent = item.label;
     if (item.tooltip)
       el.title = item.tooltip;
+    if (item.submenu && item.submenu.length > 0 && !item.disabled) {
+      el.style.display = "flex";
+      el.style.justifyContent = "space-between";
+      el.style.gap = "12px";
+      const caret = document.createElement("span");
+      caret.textContent = "\u25B8";
+      caret.style.opacity = "0.6";
+      el.appendChild(caret);
+      const open = () => openSubmenu(el, item.submenu);
+      el.addEventListener("mouseenter", open);
+      el.addEventListener("click", (e) => {
+        e.stopPropagation();
+        open();
+      });
+      menu.appendChild(el);
+      continue;
+    }
+    el.addEventListener("mouseenter", closeSubmenu);
     if (!item.disabled) {
       el.addEventListener("click", () => {
         closeContextMenu();
@@ -4485,6 +4751,8 @@ function showContextMenu(x, y, items) {
   activeMenu = menu;
   requestAnimationFrame(() => {
     dismissListener = (e) => {
+      if (activeSubmenu?.contains(e.target))
+        return;
       if (activeMenu && !activeMenu.contains(e.target)) {
         closeContextMenu();
       }
@@ -5413,7 +5681,7 @@ function applyInit(init) {
   if (init.mode !== "draft" && !init.draftUid) {
     let sigHtml = "";
     if (acct?.sig?.text) {
-      sigHtml = acct.sig.html ? acct.sig.text : escapeHtml(acct.sig.text).replace(/\n/g, "<br>");
+      sigHtml = acct.sig.html ? acct.sig.text : escapeHtml2(acct.sig.text).replace(/\n/g, "<br>");
     } else if (acct?.signature) {
       sigHtml = acct.signature;
     }
@@ -6100,60 +6368,6 @@ async function popoutHandoff() {
 window.addEventListener("compose-popout", () => {
   void popoutHandoff();
 });
-async function runClipboardCommand(id) {
-  const ne = editor?.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 html2 = "";
-      let text2 = "";
-      if (navigator.clipboard?.read) {
-        for (const item of await navigator.clipboard.read()) {
-          if (item.types.includes("text/html")) html2 = await (await item.getType("text/html")).text();
-          if (item.types.includes("text/plain")) text2 = await (await item.getType("text/plain")).text();
-        }
-      } else {
-        text2 = await navigator.clipboard.readText();
-      }
-      const content = html2 || (text2 ? text2.replace(/[&<>]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;" })[c]).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;
-    }
-    if (isTiny) {
-      try {
-        if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") ne.selection.expand({ type: "word" });
-      } catch {
-      }
-    }
-    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) {
-    showDraftStatus(`${label} failed: ${e?.message || e}. ${shortcut} still works.`, true);
-  }
-}
 window.__msgerContextCommand = (id) => {
   if (id === "source") {
     try {
@@ -6162,61 +6376,7 @@ window.__msgerContextCommand = (id) => {
     }
     return;
   }
-  if (id === "cut" || id === "copy" || id === "paste") {
-    void runClipboardCommand(id);
-    return;
-  }
-  const ne = editor?.nativeEditor;
-  if (!ne) return;
-  const isTiny = typeof ne.execCommand === "function" && ne.selection;
-  if (isTiny) {
-    try {
-      if (ne.selection.isCollapsed() && typeof ne.selection.expand === "function") ne.selection.expand({ type: "word" });
-    } catch {
-    }
-    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") {
-    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;
-    }
-  }
+  runFormatCommand(editor?.nativeEditor, id);
 };
 var ccRow = document.getElementById("compose-cc-row");
 var bccRow = document.getElementById("compose-bcc-row");
@@ -6249,7 +6409,7 @@ function renderAttachmentChips() {
     const a = attachments[i];
     const chip = document.createElement("span");
     chip.className = "compose-att-chip";
-    chip.innerHTML = `\u{1F4CE} ${escapeHtml(a.filename)} (${formatSize(a.size)}) `;
+    chip.innerHTML = `\u{1F4CE} ${escapeHtml2(a.filename)} (${formatSize(a.size)}) `;
     const rm = document.createElement("button");
     rm.type = "button";
     rm.title = "Remove attachment";
@@ -6262,7 +6422,7 @@ function renderAttachmentChips() {
     attEl.appendChild(chip);
   }
 }
-function escapeHtml(s) {
+function escapeHtml2(s) {
   return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 }
 function formatSize(n) {
@@ -6404,9 +6564,9 @@ function showExternalEditHint(editorLabel) {
   const panel = document.createElement("div");
   panel.style.cssText = "background:var(--color-bg, #fff);color:var(--color-text, #000);border:1px solid var(--color-border, #ccc);border-radius:8px;padding:18px 22px;max-width:480px;box-shadow:0 8px 32px rgba(0,0,0,0.4);font:14px/1.5 system-ui;";
   panel.innerHTML = `
-        <div style="font-weight:600;font-size:16px;margin-bottom:10px;">Editing in ${escapeHtml(editorLabel)}</div>
+        <div style="font-weight:600;font-size:16px;margin-bottom:10px;">Editing in ${escapeHtml2(editorLabel)}</div>
         <ol style="margin:0 0 12px 18px;padding:0;">
-            <li>Edit your message in <b>${escapeHtml(editorLabel)}</b>.</li>
+            <li>Edit your message in <b>${escapeHtml2(editorLabel)}</b>.</li>
             <li>Save (<b>Ctrl+S</b>). Choose <b>"Web Page, Filtered (.htm)"</b> if asked for a format \u2014 keep the same filename.</li>
             <li>Switch back to this window (<b>Alt+Tab</b>). The body will reload here.</li>
             <li>Click <b>Send</b> in this window when ready.</li>