@bobfrankston/rmfmail 1.1.161 → 1.1.163

package/client/app.ts

@@ -3371,6 +3371,7 @@ viewBtn?.addEventListener("click", (e) => {
     // it renders in the expected position-absolute location.
     restoreToolbarDropdown("view-dropdown", "view-menu");
     if (viewDropdown) viewDropdown.hidden = !viewDropdown.hidden;
+    refreshToolbarOverlayShield();
 });
 // Capture-phase pointerdown so we run BEFORE any handler that calls
 // stopPropagation. The earlier bubble-phase click listener missed clicks
@@ -3391,7 +3392,45 @@ document.addEventListener("pointerdown", (e) => {
     if (settingsDropdown && !settingsDropdown.hidden && !target.closest("#settings-menu") && !target.closest("#settings-dropdown")) {
         settingsDropdown.hidden = true;
     }
+    refreshToolbarOverlayShield();
 }, true);
+
+// Click-to-dismiss for the toolbar dropdowns relies on `pointerdown` firing
+// on the parent document. Clicks inside the compose iframe stay in the
+// iframe's document and never bubble out, so a Settings/View menu opened
+// over compose used to stay stuck until the user hit Escape or the toolbar
+// button again. Shield the overlay with a transparent fullscreen catcher
+// while any toolbar dropdown is open — its pointerdown lands here in the
+// parent doc, triggering the same outside-click close. The shield sits
+// above compose (z 1600) but below the dropdown itself (z 2000).
+function refreshToolbarOverlayShield(): void {
+    const dropdownOpen = ["settings-dropdown", "view-dropdown", "restart-dropdown"]
+        .some(id => {
+            const el = document.getElementById(id);
+            return el && !el.hidden;
+        });
+    const hasOverlay = !!document.querySelector(".compose-overlay, .popout-overlay");
+    let shield = document.getElementById("tb-overlay-shield");
+    if (dropdownOpen && hasOverlay) {
+        if (!shield) {
+            shield = document.createElement("div");
+            shield.id = "tb-overlay-shield";
+            shield.style.cssText = "position:fixed;inset:0;z-index:1999;background:transparent;";
+            shield.addEventListener("pointerdown", (ev) => {
+                ev.preventDefault();
+                ev.stopPropagation();
+                for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
+                    const dd = document.getElementById(id);
+                    if (dd) dd.hidden = true;
+                }
+                shield?.remove();
+            });
+            document.body.appendChild(shield);
+        }
+    } else if (shield) {
+        shield.remove();
+    }
+}
 // Escape always closes any open dropdown/backdrop, regardless of how it was
 // opened or whether an outside-click handler missed firing. Last-resort
 // escape hatch for the "stuck modal" case.
@@ -3406,7 +3445,10 @@ document.addEventListener("keydown", (e) => {
     if (bd) { bd.remove(); closed = true; }
     const themeSub = document.getElementById("theme-submenu");
     if (themeSub && !themeSub.hidden) { themeSub.hidden = true; closed = true; }
-    if (closed) e.preventDefault();
+    if (closed) {
+        e.preventDefault();
+        refreshToolbarOverlayShield();
+    }
 });
 
 // Restore saved view settings
@@ -4385,6 +4427,7 @@ settingsBtn?.addEventListener("click", (e) => {
     if (restartDd) restartDd.hidden = true;
     restoreToolbarDropdown("settings-dropdown", "settings-menu");
     if (settingsDropdown) settingsDropdown.hidden = !settingsDropdown.hidden;
+    refreshToolbarOverlayShield();
 });
 // Close handled by the shared document click handler above
 

package/client/compose/compose.bundle.js

@@ -746,7 +746,21 @@ async function createTinyMceEditor(container2, opts = {}) {
         const ZOOM_STEP = 2;
         const ZOOM_MIN = 8;
         const ZOOM_MAX = 32;
+        const ZOOM_STORAGE_KEY = "rmf-tiny:zoom-px";
         let zoomPx = ZOOM_DEFAULT;
+        try {
+          const stored = Number(localStorage.getItem(ZOOM_STORAGE_KEY));
+          if (Number.isFinite(stored) && stored >= ZOOM_MIN && stored <= ZOOM_MAX) {
+            zoomPx = stored;
+          }
+        } catch {
+        }
+        const saveZoom = () => {
+          try {
+            localStorage.setItem(ZOOM_STORAGE_KEY, String(zoomPx));
+          } catch {
+          }
+        };
         const applyZoom = () => {
           try {
             const body = ed.getBody();
@@ -758,6 +772,7 @@ async function createTinyMceEditor(container2, opts = {}) {
         const bumpZoom = (delta) => {
           zoomPx = Math.max(ZOOM_MIN, Math.min(ZOOM_MAX, zoomPx + delta));
           applyZoom();
+          saveZoom();
         };
         ed.ui.registry.addMenuItem("zoomIn", {
           text: "Zoom in",
@@ -775,6 +790,7 @@ async function createTinyMceEditor(container2, opts = {}) {
           onAction: () => {
             zoomPx = ZOOM_DEFAULT;
             applyZoom();
+            saveZoom();
           }
         });
         const installLinkEscape = () => {
@@ -830,6 +846,8 @@ async function createTinyMceEditor(container2, opts = {}) {
               doc.documentElement.setAttribute("lang", "en");
           } catch {
           }
+          if (zoomPx !== ZOOM_DEFAULT)
+            applyZoom();
           try {
             const doc = ed.getDoc();
             doc.addEventListener("wheel", (e) => {
@@ -1964,6 +1982,9 @@ function decorate(editor2, sp) {
   const doc = editor2.getDoc?.();
   if (!body || !doc)
     return;
+  const _activeSel = doc.getSelection();
+  if (_activeSel && _activeSel.rangeCount > 0 && !_activeSel.isCollapsed)
+    return;
   let savedFocusNode = null;
   let savedFocusOffset = 0;
   const _preSel = doc.getSelection();
@@ -2289,6 +2310,9 @@ function cleanupCorrected(editor2, sp) {
   const doc = editor2.getDoc?.();
   if (!body || !doc)
     return;
+  const activeSel = doc.getSelection();
+  if (activeSel && activeSel.rangeCount > 0 && !activeSel.isCollapsed)
+    return;
   const markers = body.querySelectorAll(`span[${MARKER_ATTR}]`);
   if (markers.length === 0)
     return;