@bobfrankston/rmfmail 1.1.65 → 1.1.68

package/client/app.ts

@@ -3512,7 +3512,7 @@ document.getElementById("btn-open-log")?.addEventListener("click", async () => {
 });
 
 async function openJsoncEditor(initialFile: string): Promise<void> {
-    const { readJsoncFile, writeJsoncFile, readConfigHelp, formatJsonc } = await import("./lib/api-client.js");
+    const { readJsoncFile, writeJsoncFile, readConfigHelp, formatJsonc, openLocalPath } = await import("./lib/api-client.js");
 
     const backdrop = document.createElement("div");
     backdrop.className = "mailx-modal-backdrop";
@@ -3549,6 +3549,7 @@ async function openJsoncEditor(initialFile: string): Promise<void> {
         <div class="mailx-modal-error" id="jsonc-error" hidden></div>
         <div class="mailx-modal-buttons">
             <button type="button" class="mailx-modal-btn" data-action="format" title="Reformat indentation while preserving comments and trailing commas">Format</button>
+            <button type="button" class="mailx-modal-btn" data-action="opensource" id="jsonc-opensource" title="Open the folder containing config.jsonc so you can edit it in a full editor" hidden>Open source folder</button>
             <span class="mailx-modal-spacer"></span>
             <button type="button" class="mailx-modal-btn" data-action="cancel">Cancel</button>
             <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" data-action="save">Save</button>
@@ -3664,8 +3665,17 @@ async function openJsoncEditor(initialFile: string): Promise<void> {
             errorEl.hidden = false;
         }
     };
+    // "Open source folder" — only meaningful for config.jsonc, the one
+    // file that lives on the local disk (~/.rmfmail/config.jsonc). The
+    // others are Google Drive objects with no local path, so the button
+    // is hidden for them. Lets the user edit config.jsonc in a real editor
+    // instead of the modal textarea.
+    const openSourceBtn = panel.querySelector<HTMLButtonElement>("#jsonc-opensource")!;
+    const updateOpenSource = () => { openSourceBtn.hidden = fileSelect.value !== "config.jsonc"; };
+    updateOpenSource();
+
     await Promise.all([loadFile(), loadHelp()]);
-    fileSelect.addEventListener("change", () => { loadFile(); loadHelp(); });
+    fileSelect.addEventListener("change", () => { loadFile(); loadHelp(); updateOpenSource(); });
 
     const close = () => {
         if (validateTimer) window.clearTimeout(validateTimer);
@@ -3682,6 +3692,13 @@ async function openJsoncEditor(initialFile: string): Promise<void> {
         btn.addEventListener("click", async () => {
             const action = btn.dataset.action;
             if (action === "cancel") { close(); return; }
+            if (action === "opensource") {
+                // Reveal ~/.rmfmail/ in the OS file manager — config.jsonc
+                // sits there; the user can then open it in a full editor.
+                try { await openLocalPath("config"); }
+                catch (e: any) { errorEl.textContent = `Couldn't open folder: ${e?.message || e}`; errorEl.hidden = false; }
+                return;
+            }
             if (action === "format") {
                 // Reformat via the service-side jsonc-parser format() — the
                 // edits are whitespace-only, so `//` and `/* */` comments

package/client/compose/compose.bundle.js

@@ -4618,6 +4618,10 @@ document.addEventListener("keydown", (e) => {
   }
   if (e.key === "Escape") {
     if (Date.now() - attachJustClicked < 1500) return;
+    const t = e.target;
+    if (t && typeof t.closest === "function" && t.closest('.mailx-modal-backdrop, .tox-dialog, [role="dialog"]')) {
+      return;
+    }
     e.preventDefault();
     handleCloseRequest();
   }