@bobfrankston/rmfmail 1.0.535 → 1.0.537

package/client/app.js

@@ -2209,28 +2209,33 @@ onWsEvent((event) => {
 });
 // ── Keyboard shortcuts ──
 // Capture-phase pre-handler: intercept WebView accelerator keys that would
-// otherwise trigger a browser action (Ctrl+R / Ctrl+Shift+R / F5 = reload,
-// Ctrl+P = print, etc.) before the document-level handler runs. Without
-// this the browser eats the keystroke. Whether preventDefault actually
-// suppresses the WebView's reload depends on WebView2's
-// AreBrowserAcceleratorKeysEnabled setting; if it doesn't, we'll need
-// the msger Rust side to disable that flag and we can also bind a
-// replacement reload key here.
+// otherwise trigger a browser action (Ctrl+R / Ctrl+Shift+R = reload). Call
+// the action directly here — earlier version re-dispatched a synthetic
+// keydown to document, which bubbled back up to this window listener and
+// fired again, breaking unrelated shortcuts (user-reported: Ctrl+N
+// stopped composing). Direct dispatch avoids the recursion.
+//
+// Whether preventDefault actually suppresses WebView2's native reload
+// depends on AreBrowserAcceleratorKeysEnabled — if it still reloads,
+// the msger Rust side needs the flag flipped (option 1 in the original
+// design notes).
 window.addEventListener("keydown", (e) => {
-    // Ctrl+Shift+R = Reply All. Ctrl+R alone = Reply (also stomps WebView reload).
-    // Both routed through the document handler below; we just ensure the
-    // browser doesn't reload.
-    if (e.ctrlKey && (e.key === "r" || e.key === "R") && !e.altKey && !e.metaKey) {
-        e.preventDefault();
-        e.stopImmediatePropagation();
-        // Re-dispatch as a document-level event so the existing handler runs
-        // (it's bound to `document` not `window`, and stopImmediatePropagation
-        // would prevent it from firing naturally on this same event).
-        document.dispatchEvent(new KeyboardEvent("keydown", {
-            key: e.key, code: e.code, ctrlKey: e.ctrlKey, shiftKey: e.shiftKey,
-            altKey: e.altKey, metaKey: e.metaKey, bubbles: true, cancelable: true,
-        }));
-    }
+    if (!e.ctrlKey || e.altKey || e.metaKey)
+        return;
+    if (e.key !== "r" && e.key !== "R")
+        return;
+    // Skip when the user is typing in an input (compose textarea etc.) so
+    // we don't hijack their typing to fire reply-all.
+    const t = e.target;
+    const tag = t?.tagName;
+    if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT" || t?.isContentEditable)
+        return;
+    e.preventDefault();
+    e.stopImmediatePropagation();
+    if (e.shiftKey)
+        openCompose("replyAll");
+    else
+        openCompose("reply");
 }, { capture: true });
 document.addEventListener("keydown", (e) => {
     // Ctrl+N or Ctrl+Shift+M = Compose