@bobfrankston/rmfmail 1.0.653 → 1.0.654

package/client/app.js

@@ -2823,21 +2823,54 @@ viewBtn?.addEventListener("click", (e) => {
     if (viewDropdown)
         viewDropdown.hidden = !viewDropdown.hidden;
 });
-document.addEventListener("click", (e) => {
-    // Only close when the click is genuinely outside the menu container.
-    // The earlier unconditional close had two problems: clicks on radio
-    // buttons / checkboxes INSIDE the menu also closed it (so the user
-    // couldn't toggle anything without reopening), and any handler
-    // upstream that consumed the event (preventDefault paths, focus
-    // shifts) could keep the menu open inappropriately. The closest()
-    // check ensures inside-clicks pass through and outside-clicks close.
+// Capture-phase pointerdown so we run BEFORE any handler that calls
+// stopPropagation. The earlier bubble-phase click listener missed clicks
+// when an upstream handler swallowed propagation, and the menu stayed open.
+// pointerdown also feels snappier than waiting for click (which fires on
+// pointerup). The closest() checks let inside-clicks (radio buttons,
+// checkboxes, the input) keep the menu open.
+document.addEventListener("pointerdown", (e) => {
     const target = e.target;
-    if (viewDropdown && !viewDropdown.hidden && !target?.closest("#view-menu") && !target?.closest("#view-dropdown")) {
+    if (!target)
+        return;
+    // Don't close if the click is on the toolbar button that toggles us —
+    // its own handler will run after this and toggle, otherwise we'd
+    // close-then-reopen-then-close.
+    if (target.closest("#btn-view, #btn-settings, #rail-view, #rail-settings, #rail-menu-backdrop"))
+        return;
+    if (viewDropdown && !viewDropdown.hidden && !target.closest("#view-menu") && !target.closest("#view-dropdown")) {
         viewDropdown.hidden = true;
     }
-    if (settingsDropdown && !settingsDropdown.hidden && !target?.closest("#settings-menu") && !target?.closest("#settings-dropdown")) {
+    if (settingsDropdown && !settingsDropdown.hidden && !target.closest("#settings-menu") && !target.closest("#settings-dropdown")) {
         settingsDropdown.hidden = true;
     }
+}, true);
+// 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.
+document.addEventListener("keydown", (e) => {
+    if (e.key !== "Escape")
+        return;
+    let closed = false;
+    for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
+        const dd = document.getElementById(id);
+        if (dd && !dd.hidden) {
+            dd.hidden = true;
+            closed = true;
+        }
+    }
+    const bd = document.getElementById("rail-menu-backdrop");
+    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();
 });
 // Restore saved view settings
 const savedTwoLine = localStorage.getItem("mailx-two-line") === "true";