@bobfrankston/rmfmail 1.2.221 → 1.2.223

package/bin/mailx.ts

@@ -183,6 +183,32 @@ const isDaemon = hasFlag("daemon"); // internal: re-spawned detached process
     }
 }
 
+/** App entries appended to the NATIVE right-click menu inside compose. msger
+ *  keeps the WebView2 default menu (that is the only place spellcheck
+ *  suggestions live) and gates these to editable targets, so they never show
+ *  on the read-only list or message preview.
+ *
+ *  Deliberately NO Cut/Copy/Paste here: WebView2's own menu already carries
+ *  them (with the right enabled/disabled state and the Ctrl+X/C/V hints), so
+ *  app copies would just be duplicates a few rows further down. The menu that
+ *  genuinely lacks them is mailx's spell menu, which preventDefaults the
+ *  native one away — that gap is filled in compose/edit-commands.ts, at the
+ *  menu that actually has the hole (Bob 2026-08-07).
+ *
+ *  Ids are dispatched to compose.ts via window.__msgerContextCommand — one
+ *  list, both windows (in-window compose overlay + popout compose), because
+ *  drift between the two is what produced "right mouse isn't showing any
+ *  formatting options" in the first place (Bob 2026-07-18). */
+const COMPOSE_CONTEXT_MENU_ITEMS = [
+    { id: "bold", label: "Bold" },
+    { id: "italic", label: "Italic" },
+    { id: "underline", label: "Underline" },
+    { id: "strike", label: "Strikethrough" },
+    { id: "link", label: "Link…" },
+    { id: "clear", label: "Clear formatting" },
+    { id: "source", label: "View HTML source…" },
+];
+
 /** Windows mailto: registration — registry keys via reg.exe. Shared by the
  *  `-register-mailto` CLI flag and the Settings → "Make default email app"
  *  menu action (injected into MailxService; the registry work stays HERE in
@@ -2420,15 +2446,7 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
                     // App entries on the NATIVE right-click menu (native stays
                     // so spellcheck suggestions survive). compose.ts maps ids
                     // to editor commands via window.__msgerContextCommand.
-                    contextMenuItems: [
-                        { id: "bold", label: "Bold" },
-                        { id: "italic", label: "Italic" },
-                        { id: "underline", label: "Underline" },
-                        { id: "strike", label: "Strikethrough" },
-                        { id: "link", label: "Link…" },
-                        { id: "clear", label: "Clear formatting" },
-                        { id: "source", label: "View HTML source…" },
-                    ],
+                    contextMenuItems: COMPOSE_CONTEXT_MENU_ITEMS,
                 });
                 popoutWindows.set(key, h);
                 if (typeof h.pid === "number") addChildPid(h.pid);
@@ -2552,15 +2570,7 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
         // "right mouse isn't showing any formatting options let alone source").
         // msger gates these to editable targets, so they DON'T appear on
         // right-clicks in the read-only list / message preview.
-        contextMenuItems: [
-            { id: "bold", label: "Bold" },
-            { id: "italic", label: "Italic" },
-            { id: "underline", label: "Underline" },
-            { id: "strike", label: "Strikethrough" },
-            { id: "link", label: "Link…" },
-            { id: "clear", label: "Clear formatting" },
-            { id: "source", label: "View HTML source…" },
-        ],
+        contextMenuItems: COMPOSE_CONTEXT_MENU_ITEMS,
     });
     // Late-bind the popout-action forwarder now that the main window's
     // service channel exists.

package/client/app.bundle.js

@@ -723,7 +723,14 @@ __export(context_menu_exports, {
   closeContextMenu: () => closeContextMenu,
   showContextMenu: () => showContextMenu
 });
+function closeSubmenu() {
+  if (activeSubmenu) {
+    activeSubmenu.remove();
+    activeSubmenu = null;
+  }
+}
 function closeContextMenu() {
+  closeSubmenu();
   if (activeMenu) {
     activeMenu.remove();
     activeMenu = null;
@@ -737,6 +744,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");
@@ -755,6 +801,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();
@@ -786,6 +850,8 @@ function showContextMenu(x, y, items) {
   activeMenu = menu;
   requestAnimationFrame(() => {
     dismissListener = (e) => {
+      if (activeSubmenu?.contains(e.target))
+        return;
       if (activeMenu && !activeMenu.contains(e.target)) {
         closeContextMenu();
       }
@@ -801,13 +867,14 @@ function showContextMenu(x, y, items) {
     document.addEventListener("keydown", escapeListener, true);
   });
 }
-var activeMenu, dismissListener, escapeListener;
+var activeMenu, dismissListener, escapeListener, activeSubmenu;
 var init_context_menu = __esm({
   "client/components/context-menu.js"() {
     "use strict";
     activeMenu = null;
     dismissListener = null;
     escapeListener = null;
+    activeSubmenu = null;
     document.addEventListener("scroll", closeContextMenu, true);
     document.addEventListener("contextmenu", () => {
     });
@@ -9117,6 +9184,17 @@ function showComposeOverlay(title = "Compose") {
   document.body.appendChild(wrapper);
   return frame;
 }
+window.__msgerContextCommand = (id) => {
+  const frames = [...document.querySelectorAll(".compose-overlay iframe")];
+  const target = frames.sort((a, b) => {
+    const z = (el) => Number(el.closest(".compose-overlay")?.style.zIndex || 0);
+    return z(b) - z(a);
+  })[0];
+  try {
+    target?.contentWindow?.__msgerContextCommand?.(id);
+  } catch {
+  }
+};
 function installDragShield(cursor) {
   const shield = document.createElement("div");
   shield.style.cssText = `position:fixed;inset:0;z-index:9999;background:transparent;cursor:${cursor};user-select:none;`;