@bobfrankston/rmfmail 1.2.194 → 1.2.196

package/client/app.ts

@@ -94,13 +94,17 @@ propagateAppName();
         if (e.key === "F5" || e.key === "F3") return true;
         if ((e.ctrlKey || e.metaKey) && (e.key === "r" || e.key === "R")) return true;
         // Browser accelerators bound to Ctrl-letter combos that mailx
-        // doesn't want to forward: P (print), S (save page), U (view
-        // source), J (downloads), L (focus address bar — n/a in WebView
-        // but harmless), G (find next). Note: O is "open file" in
-        // browsers — mailx uses Ctrl+O nowhere meaningful, so block.
+        // doesn't want to forward: S (save page), U (view source),
+        // J (downloads), L (focus address bar — n/a in WebView but
+        // harmless), G (find next). Note: O is "open file" in browsers —
+        // mailx uses Ctrl+O nowhere meaningful, so block. P is NOT here:
+        // mailx's own Ctrl+P handler prints the focused letter and
+        // preventDefaults the browser dialog itself — listing it here
+        // stopPropagation'd the event before that handler could run, which
+        // is why the print shortcut was dead (Bob 2026-07-30).
         if (e.ctrlKey || e.metaKey) {
             const k = e.key.toLowerCase();
-            if (["p", "s", "u", "j", "l", "g", "o"].includes(k)) return true;
+            if (["s", "u", "j", "l", "g", "o"].includes(k)) return true;
         }
         // Alt+Left / Alt+Right = browser back / forward. No use in mailx.
         if (e.altKey && (e.key === "ArrowLeft" || e.key === "ArrowRight")) return true;
@@ -3746,13 +3750,17 @@ document.addEventListener("keydown", (e) => {
         openCompose("new");
     }
     // Ctrl+P = Print the focused message. preventDefault stops the host
-    // browser from printing the whole app window instead of the letter.
+    // browser from printing the whole app window instead of the letter —
+    // UNCONDITIONALLY, even with focus in a text field: the WebView's
+    // whole-app print dialog is never what the user wants, and ^P should
+    // print the current letter regardless of where the caret sits.
     if (e.ctrlKey && (e.key === "p" || e.key === "P") && !e.shiftKey && !e.altKey) {
-        const t = e.target as HTMLElement | null;
-        const inText = t && (t.tagName === "INPUT" || t.tagName === "TEXTAREA" || t.isContentEditable);
-        if (!inText) {
-            e.preventDefault();
+        e.preventDefault();
+        if (getCurrentMessage()) {
             printCurrentMessage();
+        } else {
+            const s = document.getElementById("status-sync");
+            if (s) s.textContent = "Nothing to print — select a message first.";
         }
     }
     // Ctrl+T = new view tab. The strip is hidden with a single tab (no wasted

package/client/compose/compose.bundle.js

@@ -3568,6 +3568,23 @@ function markdownToEmailHtml(md) {
   }
   return out.join("\n");
 }
+function looksLikeHtml(text) {
+  if (!text || text.length > 5e5)
+    return false;
+  const t = text.trim();
+  if (!t.startsWith("<"))
+    return false;
+  if (!/^<(!doctype|html|head|body|div|p|table|ul|ol|li|h[1-6]|blockquote|section|article|header|footer|span|b|i|strong|em|a|img|br|hr|pre|code|font|center)\b/i.test(t))
+    return false;
+  return /<\/[a-z][a-z0-9]*\s*>/i.test(t) || /^<(img|br|hr|!doctype)\b/i.test(t);
+}
+function sanitizeHtmlSource(html) {
+  let t = html;
+  const bm = t.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
+  if (bm)
+    t = bm[1];
+  return t.replace(/<script\b[\s\S]*?<\/script\s*>/gi, "").replace(/<style\b[\s\S]*?<\/style\s*>/gi, "").replace(/\son[a-z]+\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)/gi, "").replace(/\s(href|src)\s*=\s*(["']?)\s*javascript:[^"'\s>]*\2/gi, "");
+}
 function wireMarkdownPaste(target, insertHtml) {
   target.addEventListener("paste", (e) => {
     try {
@@ -3579,11 +3596,18 @@ function wireMarkdownPaste(target, insertHtml) {
       if (Array.from(cb.items).some((it) => it.kind === "file"))
         return;
       const plain = cb.getData("text/plain");
-      if (!plain || !looksLikeMarkdown(plain))
+      if (!plain)
+        return;
+      let converted = null;
+      if (looksLikeHtml(plain))
+        converted = sanitizeHtmlSource(plain);
+      else if (looksLikeMarkdown(plain))
+        converted = markdownToEmailHtml(plain);
+      if (converted === null)
         return;
       e.preventDefault();
       e.stopImmediatePropagation();
-      insertHtml(markdownToEmailHtml(plain));
+      insertHtml(converted);
     } catch {
     }
   }, true);
@@ -4035,6 +4059,14 @@ function createQuillEditor(container2) {
       }
       return;
     }
+    if (plain && looksLikeHtml(plain)) {
+      consume();
+      const range = q.getSelection(true) || { index: q.getLength(), length: 0 };
+      if (range.length > 0)
+        q.deleteText(range.index, range.length);
+      q.clipboard.dangerouslyPasteHTML(range.index, sanitizeHtmlSource(plain));
+      return;
+    }
     if (plain && looksLikeMarkdown(plain)) {
       consume();
       const range = q.getSelection(true) || { index: q.getLength(), length: 0 };