@bobfrankston/rmfmail 1.1.202 → 1.1.204

package/client/app.ts

@@ -3168,9 +3168,17 @@ document.addEventListener("keydown", (e) => {
         e.preventDefault();
         deleteSelection();
     }
-    // Ctrl+Z = pop the top of the undo stack (delete / move / flag).
+    // Ctrl+Z = pop the top of the undo stack (delete / move / flag). Guard the
+    // SAME way Delete does (the block above): never hijack Ctrl+Z when focus is
+    // in a text field / contenteditable, and never while a compose overlay is
+    // open — the editor (or the input) owns undo there. Without this guard the
+    // mail-action undo could fire instead of an editor/text undo.
     if (e.ctrlKey && e.key === "z") {
-        if (undoStack.length > 0) {
+        const t = e.target as HTMLElement | null;
+        const tag = t?.tagName;
+        const inEditable = tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT" || !!t?.isContentEditable;
+        const composeOpen = !!document.querySelector(".compose-overlay");
+        if (!inEditable && !composeOpen && undoStack.length > 0) {
             e.preventDefault();
             performUndo();
         }

package/client/compose/compose.bundle.js

@@ -1900,6 +1900,26 @@ async function createTinyMceEditor(container2, opts = {}) {
   target.id = `rmf-tiny-${Math.random().toString(36).slice(2, 10)}`;
   target.style.cssText = "width:100%;height:100%;";
   container2.appendChild(target);
+  const CODE_LANGS = [
+    { text: "Text", value: "text" },
+    { text: "HTML/XML", value: "markup" },
+    { text: "JavaScript", value: "javascript" },
+    { text: "TypeScript", value: "typescript" },
+    { text: "CSS", value: "css" },
+    { text: "JSON", value: "json" },
+    { text: "Python", value: "python" },
+    { text: "Java", value: "java" },
+    { text: "C", value: "c" },
+    { text: "C++", value: "cpp" },
+    { text: "C#", value: "csharp" },
+    { text: "Go", value: "go" },
+    { text: "Rust", value: "rust" },
+    { text: "Ruby", value: "ruby" },
+    { text: "PHP", value: "php" },
+    { text: "Shell", value: "bash" },
+    { text: "PowerShell", value: "powershell" },
+    { text: "SQL", value: "sql" }
+  ];
   const editor2 = await new Promise((resolve) => {
     tinymce.init({
       target,
@@ -1912,7 +1932,7 @@ async function createTinyMceEditor(container2, opts = {}) {
       plugins: "paste lists advlist link table code codesample image searchreplace autolink wordcount emoticons charmap insertdatetime quickbars nonbreaking directionality help",
       toolbar: [
         "undo redo | bold italic underline strikethrough | forecolor backcolor",
-        "bullist numlist outdent indent | link table image code codesample | emoticons charmap | help"
+        "bullist numlist outdent indent | link table image code rmfcode | emoticons charmap | help"
       ].join(" | "),
       // Include "tools" so wordcount and searchreplace are reachable.
       menubar: "file edit view insert format tools",
@@ -1939,25 +1959,7 @@ async function createTinyMceEditor(container2, opts = {}) {
       // which mangles unrelated paste content (Bob 2026-05-24).
       // Adding Text first so it's the default; rest are the modern
       // languages we actually paste.
-      codesample_languages: [
-        { text: "Text", value: "text" },
-        { text: "HTML/XML", value: "markup" },
-        { text: "JavaScript", value: "javascript" },
-        { text: "TypeScript", value: "typescript" },
-        { text: "CSS", value: "css" },
-        { text: "JSON", value: "json" },
-        { text: "Python", value: "python" },
-        { text: "Java", value: "java" },
-        { text: "C", value: "c" },
-        { text: "C++", value: "cpp" },
-        { text: "C#", value: "csharp" },
-        { text: "Go", value: "go" },
-        { text: "Rust", value: "rust" },
-        { text: "Ruby", value: "ruby" },
-        { text: "PHP", value: "php" },
-        { text: "Shell", value: "bash" },
-        { text: "SQL", value: "sql" }
-      ],
+      codesample_languages: CODE_LANGS,
       // WebView's native spell-check (red underlines, right-click
       // "Add to dictionary"). Free; same UX as Quill's spellcheck=true.
       // Premium tinymcespellchecker plugin would replace this with a
@@ -1975,6 +1977,17 @@ async function createTinyMceEditor(container2, opts = {}) {
       statusbar: false,
       branding: false,
       license_key: "gpl",
+      // Keep URLs verbatim. TinyMCE defaults to convert_urls:true +
+      // relative_urls:true, which rewrites an absolute href
+      // (https://github.com/…) to be RELATIVE to the editor's base URL
+      // (the msger custom-protocol page). A link that worked in the
+      // original message arrives in the reply quote rewritten/dead
+      // (Bob 2026-05-31: "URL works in the original but not in the
+      // reply"). false on both = hrefs travel into the sent message
+      // exactly as the sender wrote them.
+      convert_urls: false,
+      relative_urls: false,
+      remove_script_host: false,
       paste_data_images: true,
       // Permissive valid_elements — preserve as much of the source
       // formatting as possible. The default is more aggressive about
@@ -2063,6 +2076,60 @@ async function createTinyMceEditor(container2, opts = {}) {
           applyZoom();
           saveZoom();
         };
+        const BORDER_STYLES = { "border": "1px solid #888", "border-radius": "4px", "padding": "10px" };
+        const openCodeDialog = () => {
+          const cs = ed.plugins.codesample;
+          const preEl = ed.dom.getParent(ed.selection.getNode(), "pre");
+          let curLang = "text";
+          let curBorder = false;
+          if (preEl) {
+            const m = (preEl.className || "").match(/language-([\w-]+)/);
+            if (m)
+              curLang = m[1];
+            curBorder = !!(preEl.style && preEl.style.border && preEl.style.border !== "none");
+          }
+          const curCode = cs && cs.getCurrentCode ? cs.getCurrentCode(ed) || "" : "";
+          ed.windowManager.open({
+            title: "Insert code",
+            size: "large",
+            body: {
+              type: "panel",
+              items: [
+                { type: "listbox", name: "language", label: "Language", items: CODE_LANGS },
+                { type: "textarea", name: "code", label: "Code" },
+                { type: "checkbox", name: "border", label: "Box it in (border around the code)" }
+              ]
+            },
+            initialData: { language: curLang, code: curCode, border: curBorder },
+            buttons: [
+              { type: "cancel", text: "Cancel" },
+              { type: "submit", text: "Save", primary: true }
+            ],
+            onSubmit: (api) => {
+              const data = api.getData();
+              if (cs && cs.insertCodeSample)
+                cs.insertCodeSample(data.language, data.code);
+              const pre = ed.dom.getParent(ed.selection.getNode(), "pre");
+              if (pre) {
+                if (data.border)
+                  ed.dom.setStyles(pre, BORDER_STYLES);
+                else
+                  ed.dom.setStyles(pre, { "border": "", "border-radius": "", "padding": "" });
+              }
+              api.close();
+            }
+          });
+        };
+        ed.ui.registry.addButton("rmfcode", {
+          icon: "code-sample",
+          tooltip: "Insert/edit code block",
+          onAction: openCodeDialog
+        });
+        ed.ui.registry.addMenuItem("rmfcode", {
+          icon: "code-sample",
+          text: "Code block\u2026",
+          onAction: openCodeDialog
+        });
         ed.ui.registry.addMenuItem("zoomIn", {
           text: "Zoom in",
           shortcut: "Ctrl+=",
@@ -2114,11 +2181,19 @@ async function createTinyMceEditor(container2, opts = {}) {
             }
             if (tail.toString().length > 0)
               return;
-            const after = doc.createRange();
-            after.setStartAfter(link);
-            after.collapse(true);
-            sel.removeAllRanges();
-            sel.addRange(after);
+            const parent2 = link.parentNode;
+            const idx = parent2 ? Array.prototype.indexOf.call(parent2.childNodes, link) + 1 : -1;
+            if (parent2 && idx >= 0) {
+              try {
+                ed.selection.setCursorLocation(parent2, idx);
+              } catch {
+                const after = doc.createRange();
+                after.setStartAfter(link);
+                after.collapse(true);
+                sel.removeAllRanges();
+                sel.addRange(after);
+              }
+            }
           }, true);
         };
         ed.on("init", installLinkEscape);