@bobfrankston/rmfmail 1.1.36 → 1.1.38

package/client/app.bundle.js

@@ -2298,7 +2298,7 @@ function pickFolder(accountId, opts) {
     }
     const excluded = new Set(opts?.excludeFolderIds || []);
     const targets = folders.filter((f) => !excluded.has(f.id)).filter((f) => f.specialUse !== "outbox").sort((a, b) => a.path.localeCompare(b.path));
-    function render(filter) {
+    function render2(filter) {
       listEl.innerHTML = "";
       const lc = filter.toLowerCase().trim();
       let firstMatchSet = false;
@@ -2331,8 +2331,8 @@ function pickFolder(accountId, opts) {
         listEl.appendChild(row);
       }
     }
-    render("");
-    search.addEventListener("input", () => render(search.value));
+    render2("");
+    search.addEventListener("input", () => render2(search.value));
     setTimeout(() => search.focus(), 0);
   });
 }
@@ -2400,24 +2400,27 @@ function rememberPosition() {
   const uid = Number(sel.dataset.uid);
   if (!Number.isFinite(uid))
     return;
-  positionMemory.set(key, { uid, scroll: body.scrollTop });
+  positionMemory.set(key, { uid, uuid: sel.dataset.uuid || "", scroll: body.scrollTop });
   persistPositions();
 }
 function pickRestoreUid(items, saved) {
   if (!items.length)
     return null;
-  if (items.some((m) => m.uid === saved))
-    return saved;
-  let best = -1;
+  if (saved.uuid) {
+    const exact = items.find((m) => m.uuid && m.uuid === saved.uuid);
+    if (exact?.uuid)
+      return exact.uuid;
+  }
+  let best = null;
   for (const m of items) {
-    if (typeof m.uid !== "number")
+    if (typeof m.uid !== "number" || !m.uuid)
       continue;
-    if (m.uid < saved && m.uid > best)
-      best = m.uid;
+    if (m.uid < saved.uid && (!best || m.uid > best.uid))
+      best = m;
   }
-  if (best >= 0)
-    return best;
-  return typeof items[0]?.uid === "number" ? items[0].uid : null;
+  if (best)
+    return best.uuid;
+  return items[0]?.uuid || null;
 }
 function listResultsEqual(a, b) {
   if (!a || a.length !== b.length)
@@ -2748,10 +2751,10 @@ async function loadUnifiedInbox(autoSelect = true) {
     totalMessages = cached.total;
     setMessages(cached.items);
     renderMessages(body, "", cached.items);
-    const targetUid = remembered ? pickRestoreUid(cached.items, remembered.uid) : null;
-    if (targetUid != null) {
+    const targetUuid = remembered ? pickRestoreUid(cached.items, remembered) : null;
+    if (targetUuid) {
       body.scrollTop = savedScroll;
-      restoreSelection(body, String(targetUid));
+      restoreSelection(body, targetUuid);
     } else if (autoSelect) {
       selectFirst(body);
     }
@@ -2773,10 +2776,10 @@ async function loadUnifiedInbox(autoSelect = true) {
     }
     setMessages(result.items);
     renderMessages(body, "", result.items);
-    const targetUid = remembered ? pickRestoreUid(result.items, remembered.uid) : null;
-    if (targetUid != null) {
+    const targetUuid = remembered ? pickRestoreUid(result.items, remembered) : null;
+    if (targetUuid) {
       body.scrollTop = savedScroll;
-      restoreSelection(body, String(targetUid));
+      restoreSelection(body, targetUuid);
     } else if (autoSelect) {
       selectFirst(body);
     }
@@ -2887,11 +2890,11 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
     totalMessages = cached.total;
     setMessages(cached.items);
     renderMessages(body, accountId, cached.items);
-    const targetUid = remembered ? pickRestoreUid(cached.items, remembered.uid) : null;
-    if (targetUid != null) {
+    const targetUuid = remembered ? pickRestoreUid(cached.items, remembered) : null;
+    if (targetUuid) {
       requestAnimationFrame(() => {
         body.scrollTop = savedScroll;
-        restoreSelection(body, String(targetUid));
+        restoreSelection(body, targetUuid);
       });
     } else if (autoSelect) {
       selectFirst(body);
@@ -2915,13 +2918,13 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
     }
     setMessages(result.items);
     renderMessages(body, accountId, result.items);
-    const targetUid = remembered ? pickRestoreUid(result.items, remembered.uid) : null;
-    if (targetUid != null) {
+    const targetUuid = remembered ? pickRestoreUid(result.items, remembered) : null;
+    if (targetUuid) {
       requestAnimationFrame(() => {
         if (myGen !== loadGen)
           return;
         body.scrollTop = savedScroll;
-        restoreSelection(body, String(targetUid));
+        restoreSelection(body, targetUuid);
       });
     } else if (autoSelect) {
       selectFirst(body);
@@ -2967,12 +2970,16 @@ function selectFirst(body) {
   if (firstRow)
     firstRow.click();
 }
-function restoreSelection(body, savedUid) {
-  if (!savedUid)
+function restoreSelection(body, savedUuid) {
+  if (!savedUuid)
+    return;
+  const row = body.querySelector(`.ml-row[data-uuid="${CSS.escape(savedUuid)}"]`);
+  if (!row)
     return;
-  const accountId = body.querySelector(`.ml-row[data-uid="${savedUid}"]`)?.dataset.accountId;
-  if (accountId) {
-    focusByIdentity(accountId, Number(savedUid), { scroll: false });
+  const accountId = row.dataset.accountId;
+  const uid = Number(row.dataset.uid);
+  if (accountId && Number.isFinite(uid)) {
+    focusByIdentity(accountId, uid, { scroll: false });
   }
 }
 async function showThreadPopup(pillEl, headMsg) {
@@ -3173,6 +3180,8 @@ var init_message_list = __esm({
         row.dataset.uid = String(msg.uid);
         row.dataset.accountId = accountId;
         row.dataset.folderId = String(msg.folderId);
+        if (msg.uuid)
+          row.dataset.uuid = msg.uuid;
         if (msg.threadId)
           row.dataset.threadId = msg.threadId;
         if (threadHead)
@@ -4466,7 +4475,7 @@ async function openAddressBook() {
   const listEl = panel.querySelector("#ab-list");
   const countEl = panel.querySelector("#ab-count");
   let editingEmail = null;
-  const render = (items, total) => {
+  const render2 = (items, total) => {
     countEl.textContent = total === items.length ? `${total} contact${total === 1 ? "" : "s"}` : `Showing ${items.length} of ${total}`;
     if (items.length === 0) {
       listEl.innerHTML = `<div class="ab-empty">No contacts match.</div>`;
@@ -4576,7 +4585,7 @@ async function openAddressBook() {
   const reload = async () => {
     try {
       const r = await listContacts(searchInput2.value, 1, 200);
-      render(r.items, r.total);
+      render2(r.items, r.total);
     } catch (e) {
       listEl.innerHTML = `<div class="ab-empty">Load failed: ${escapeHtml5(e?.message || String(e))}</div>`;
     }
@@ -6090,6 +6099,135 @@ async function updateFolderCounts() {
 // client/app.ts
 init_message_list();
 init_mailx_types();
+
+// client/components/tabs.js
+var STORAGE_KEY = "mailx-view-tabs";
+var tabs = [];
+var activeId = "";
+var stripEl = null;
+var applyView = () => {
+};
+var _nextId = 1;
+function newId() {
+  return `t${_nextId++}`;
+}
+function persist() {
+  try {
+    sessionStorage.setItem(STORAGE_KEY, JSON.stringify({ tabs, activeId }));
+  } catch {
+  }
+}
+function render() {
+  if (!stripEl)
+    return;
+  stripEl.innerHTML = "";
+  for (const tab of tabs) {
+    const chip = document.createElement("div");
+    chip.className = "view-tab" + (tab.id === activeId ? " active" : "");
+    chip.dataset.tabId = tab.id;
+    const label = document.createElement("span");
+    label.className = "view-tab-label";
+    label.textContent = tab.title || "(view)";
+    chip.appendChild(label);
+    if (tabs.length > 1) {
+      const close = document.createElement("button");
+      close.className = "view-tab-close";
+      close.textContent = "\xD7";
+      close.title = "Close tab";
+      close.addEventListener("click", (e) => {
+        e.stopPropagation();
+        closeTab(tab.id);
+      });
+      chip.appendChild(close);
+    }
+    chip.addEventListener("click", () => activate(tab.id));
+    stripEl.appendChild(chip);
+  }
+  const plus = document.createElement("button");
+  plus.className = "view-tab-new";
+  plus.textContent = "+";
+  plus.title = "New tab (All Inboxes)";
+  plus.addEventListener("click", () => openTab({ kind: "unified" }, "All Inboxes", true));
+  stripEl.appendChild(plus);
+  stripEl.hidden = tabs.length < 1;
+}
+function initTabs(strip, apply) {
+  stripEl = strip;
+  applyView = apply;
+  try {
+    const raw = sessionStorage.getItem(STORAGE_KEY);
+    if (raw) {
+      const parsed = JSON.parse(raw);
+      if (Array.isArray(parsed?.tabs) && parsed.tabs.length) {
+        tabs = parsed.tabs;
+        activeId = parsed.activeId || tabs[0].id;
+        for (const t of tabs) {
+          const n = Number(String(t.id).replace(/^t/, ""));
+          if (Number.isFinite(n) && n >= _nextId)
+            _nextId = n + 1;
+        }
+      }
+    }
+  } catch {
+  }
+  render();
+}
+function activeTab() {
+  return tabs.find((t) => t.id === activeId) || null;
+}
+function openTab(view, title, activateIt = true) {
+  const tab = { id: newId(), title, view };
+  tabs.push(tab);
+  if (activateIt)
+    activeId = tab.id;
+  persist();
+  render();
+  if (activateIt)
+    applyView(tab);
+}
+function activate(id) {
+  const tab = tabs.find((t) => t.id === id);
+  if (!tab || id === activeId)
+    return;
+  activeId = id;
+  persist();
+  render();
+  applyView(tab);
+}
+function closeTab(id) {
+  if (tabs.length < 2)
+    return;
+  const idx = tabs.findIndex((t) => t.id === id);
+  if (idx < 0)
+    return;
+  const wasActive = id === activeId;
+  tabs.splice(idx, 1);
+  if (wasActive) {
+    const next = tabs[Math.max(0, idx - 1)];
+    activeId = next.id;
+    persist();
+    render();
+    applyView(next);
+  } else {
+    persist();
+    render();
+  }
+}
+function setActiveView(view, title) {
+  let tab = activeTab();
+  if (!tab) {
+    tab = { id: newId(), title, view };
+    tabs.push(tab);
+    activeId = tab.id;
+  } else {
+    tab.view = view;
+    tab.title = title;
+  }
+  persist();
+  render();
+}
+
+// client/app.ts
 init_message_viewer();
 init_api_client();
 init_message_state();
@@ -6383,6 +6521,7 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
   loadMessages(accountId, folderId, 1, specialUse);
   setTitle(`${APP_NAME} - ${folderName}`);
   setNarrowFolderTitle(folderName);
+  setActiveView({ kind: "folder", accountId, folderId, specialUse }, folderName);
   document.dispatchEvent(new CustomEvent("mailx-folder-changed", { detail: { accountId, folderId } }));
 }, () => {
   currentFolderSpecialUse = "inbox";
@@ -6392,7 +6531,34 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
   loadUnifiedInbox();
   setTitle(`${APP_NAME} - All Inboxes`);
   setNarrowFolderTitle("All Inboxes");
+  setActiveView({ kind: "unified" }, "All Inboxes");
 });
+function applyTabView(tab) {
+  if (searchInput) searchInput.value = "";
+  clearSearchMode();
+  releaseFocus();
+  const v = tab.view;
+  if (v.kind === "unified") {
+    currentFolderSpecialUse = "inbox";
+    loadUnifiedInbox();
+    setTitle(`${APP_NAME} - All Inboxes`);
+    setNarrowFolderTitle("All Inboxes");
+  } else if (v.kind === "folder") {
+    currentFolderSpecialUse = v.specialUse;
+    currentAccountId3 = v.accountId;
+    currentFolderId2 = v.folderId;
+    loadMessages(v.accountId, v.folderId, 1, v.specialUse);
+    setTitle(`${APP_NAME} - ${tab.title}`);
+    setNarrowFolderTitle(tab.title);
+  } else {
+    if (searchInput) searchInput.value = v.query;
+    loadSearchResults(v.query, v.scope, v.accountId, v.folderId, v.includeTrash);
+    setTitle(`${APP_NAME} - Search`);
+    setNarrowFolderTitle(`Search: ${v.query}`);
+  }
+}
+var tabStripEl = document.getElementById("view-tab-strip");
+if (tabStripEl) initTabs(tabStripEl, applyTabView);
 initMessageList((_accountId, _uid, _folderId) => {
   if (window.innerWidth <= 768) {
     document.getElementById("message-viewer")?.classList.add("narrow-active");
@@ -7400,6 +7566,10 @@ function doSearch(immediate = false) {
   }
   loadSearchResults(query, effectiveScope, currentAccountId3, currentFolderId2, includeTrash);
   setTitle(`${APP_NAME} - Search: ${query}`);
+  setActiveView(
+    { kind: "search", query, scope: effectiveScope, accountId: currentAccountId3, folderId: currentFolderId2, includeTrash },
+    `Search: ${query}`
+  );
   if (immediate) recordSearchHistory(query);
 }
 var currentAccountId3 = "";
@@ -8239,7 +8409,7 @@ function openShortcutsDialog() {
   const panel = document.createElement("div");
   panel.className = "mailx-modal";
   panel.style.maxWidth = "640px";
-  const tabs = [
+  const tabs2 = [
     {
       id: "app",
       label: "Application",
@@ -8298,10 +8468,10 @@ function openShortcutsDialog() {
             <button type="button" class="mailx-modal-close" id="sc-x" title="Close (Esc)" aria-label="Close">&times;</button>
         </div>
         <div class="mailx-shortcuts-tabs" role="tablist" style="display:flex;gap:0;border-bottom:1px solid var(--color-border, #ddd);margin:0 -16px 12px -16px;padding:0 16px;">
-            ${tabs.map((t, i) => `<button type="button" role="tab" class="mailx-shortcuts-tab" data-tab="${t.id}" aria-selected="${i === 0}" style="background:none;border:0;padding:8px 14px;cursor:pointer;font:inherit;border-bottom:2px solid ${i === 0 ? "var(--color-accent, #3b82f6)" : "transparent"};color:${i === 0 ? "var(--color-text)" : "var(--color-text-muted, #888)"};">${t.label}</button>`).join("")}
+            ${tabs2.map((t, i) => `<button type="button" role="tab" class="mailx-shortcuts-tab" data-tab="${t.id}" aria-selected="${i === 0}" style="background:none;border:0;padding:8px 14px;cursor:pointer;font:inherit;border-bottom:2px solid ${i === 0 ? "var(--color-accent, #3b82f6)" : "transparent"};color:${i === 0 ? "var(--color-text)" : "var(--color-text-muted, #888)"};">${t.label}</button>`).join("")}
         </div>
         <div class="mailx-about">
-            ${tabs.map((t, i) => `<div class="mailx-shortcuts-pane" data-pane="${t.id}" ${i === 0 ? "" : "hidden"}>
+            ${tabs2.map((t, i) => `<div class="mailx-shortcuts-pane" data-pane="${t.id}" ${i === 0 ? "" : "hidden"}>
                 <dl class="mailx-about-dl">
                     ${t.rows.map(([k, v]) => `<dt>${k}</dt><dd>${v}</dd>`).join("")}
                 </dl>