@bobfrankston/rmfmail 1.1.160 → 1.1.162

package/client/app.js

@@ -3548,6 +3548,7 @@ viewBtn?.addEventListener("click", (e) => {
     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
@@ -3570,7 +3571,46 @@ 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() {
+    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.
@@ -3595,8 +3635,10 @@ document.addEventListener("keydown", (e) => {
         themeSub.hidden = true;
         closed = true;
     }
-    if (closed)
+    if (closed) {
         e.preventDefault();
+        refreshToolbarOverlayShield();
+    }
 });
 // Restore saved view settings
 const savedTwoLine = localStorage.getItem("mailx-two-line") === "true";
@@ -4694,6 +4736,7 @@ settingsBtn?.addEventListener("click", (e) => {
     restoreToolbarDropdown("settings-dropdown", "settings-menu");
     if (settingsDropdown)
         settingsDropdown.hidden = !settingsDropdown.hidden;
+    refreshToolbarOverlayShield();
 });
 // Close handled by the shared document click handler above
 // Load current editor setting from server
@@ -5113,6 +5156,7 @@ document.addEventListener("mailx-popout-message", (async (e) => {
             accounts: accts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig })),
             draftUid: msg.uid,
             draftFolderId: msg.folderId,
+            draftId: msg.mailxDraftId || "",
         };
         sessionStorage.setItem("composeInit", JSON.stringify(init));
         showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");