@bobfrankston/rmfmail 1.2.119 → 1.2.121

package/client/app.ts

@@ -5222,8 +5222,27 @@ getSettings().then((s: any) => {
     if (optEditorQuill) optEditorQuill.checked = ed === "quill";
     if (optEditorTiptap) optEditorTiptap.checked = ed === "tiptap";
     if (optEditorTinymce) optEditorTinymce.checked = ed === "tinymce";
+    const fontEl = document.getElementById("opt-compose-font-size") as HTMLInputElement | null;
+    if (fontEl) {
+        const px = Number(s.ui?.composeFontSize);
+        fontEl.value = String(Number.isFinite(px) && px >= 8 && px <= 32 ? px : 15);
+    }
 }).catch(() => {});
 
+// Unified compose editing font size (px). Same sync-cache-then-persist shape
+// as saveEditorSetting: compose.ts reads `mailx-compose-font-size` from
+// localStorage at module load, so the very next compose-open is correct.
+document.getElementById("opt-compose-font-size")?.addEventListener("change", (e) => {
+    const el = e.target as HTMLInputElement;
+    const px = Number(el.value);
+    if (!Number.isFinite(px) || px < 8 || px > 32) return;
+    try { localStorage.setItem("mailx-compose-font-size", String(px)); } catch { /* */ }
+    getSettings().then((settings: any) => {
+        settings.ui = { ...settings.ui, composeFontSize: px };
+        saveSettings(settings);
+    }).catch(() => {});
+});
+
 // Save editor choice to server settings
 function saveEditorSetting(editor: string): void {
     // Update the localStorage cache SYNCHRONOUSLY. compose.ts reads

package/client/compose/compose.bundle.js

@@ -2173,7 +2173,7 @@ async function createTinyMceEditor(container2, opts = {}) {
         // an undefined/oversized line-height plus per-line font-size
         // changes threw it off. A definite, tight line-height gives the
         // marker a stable baseline to sit under.
-        "body { font-family: system-ui, sans-serif; font-size: 14px; line-height: 1.3; caret-color: #0a2647; }",
+        `body { font-family: system-ui, sans-serif; font-size: ${opts.fontSizePx ?? 14}px; line-height: 1.3; caret-color: #0a2647; }`,
         "blockquote { border-left: 3px solid #c0c8d0; margin: 0 0 0 4px; padding: 2px 0 2px 10px; color: #555; }",
         // Drop the 0.5em margin-gap above the reply block and the per-line
         // font-size shrink on the attribution line — both contributed to
@@ -2187,7 +2187,27 @@ async function createTinyMceEditor(container2, opts = {}) {
       setup: (ed) => {
         if (opts.initialHtml)
           ed.on("init", () => ed.setContent(opts.initialHtml));
-        const ZOOM_DEFAULT = 14;
+        ed.on("GetContent", (e) => {
+          if (!e?.content || typeof e.content !== "string" || !e.content.includes("blob:"))
+            return;
+          e.content = e.content.replace(/src="(blob:[^"]+)"/g, (m, uri) => {
+            const info = ed.editorUpload?.blobCache?.getByUri?.(uri);
+            return info ? `src="data:${info.blob().type};base64,${info.base64()}"` : m;
+          });
+        });
+        ed.on("OpenWindow", () => {
+          requestAnimationFrame(() => requestAnimationFrame(() => {
+            const ta = document.querySelector(".tox-dialog textarea");
+            if (ta && ta.value) {
+              try {
+                ta.setSelectionRange(0, 0);
+                ta.scrollTop = 0;
+              } catch {
+              }
+            }
+          }));
+        });
+        const ZOOM_DEFAULT = opts.fontSizePx ?? 14;
         const ZOOM_STEP = 2;
         const ZOOM_MIN = 8;
         const ZOOM_MAX = 32;
@@ -3672,7 +3692,8 @@ async function createTinyMceEditor2(container2, opts = {}) {
   } catch {
   }
   const m = await Promise.resolve().then(() => (init_rmf_tiny(), rmf_tiny_exports));
-  const ed = await m.createTinyMceEditor(container2, { cdnUrl, apiKey, onFiles: opts.onFiles });
+  const cssPx = parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--compose-font-size"));
+  const ed = await m.createTinyMceEditor(container2, { cdnUrl, apiKey, onFiles: opts.onFiles, fontSizePx: Number.isFinite(cssPx) ? cssPx : void 0 });
   return ed;
 }
 
@@ -3823,6 +3844,18 @@ try {
   if (cached === "tiptap" || cached === "quill" || cached === "tinymce") editorType = cached;
 } catch {
 }
+var COMPOSE_FONT_MIN_PX = 8;
+var COMPOSE_FONT_MAX_PX = 32;
+var COMPOSE_FONT_DEFAULT_PX = 15;
+function applyComposeFontSize(px) {
+  if (!Number.isFinite(px) || px < COMPOSE_FONT_MIN_PX || px > COMPOSE_FONT_MAX_PX) px = COMPOSE_FONT_DEFAULT_PX;
+  document.documentElement.style.setProperty("--compose-font-size", `${px}px`);
+}
+try {
+  applyComposeFontSize(Number(localStorage.getItem("mailx-compose-font-size")));
+} catch {
+  applyComposeFontSize(COMPOSE_FONT_DEFAULT_PX);
+}
 (async () => {
   try {
     appSettings = await getSettings();
@@ -3832,6 +3865,14 @@ try {
       localStorage.setItem("mailx-editor-type", next);
     } catch {
     }
+    const fontPx = Number(appSettings?.ui?.composeFontSize);
+    if (Number.isFinite(fontPx) && fontPx >= COMPOSE_FONT_MIN_PX && fontPx <= COMPOSE_FONT_MAX_PX) {
+      try {
+        localStorage.setItem("mailx-compose-font-size", String(fontPx));
+      } catch {
+      }
+      applyComposeFontSize(fontPx);
+    }
   } catch {
   }
 })();