@bobfrankston/rmfmail 1.2.102 → 1.2.103

package/client/app.bundle.js

@@ -3117,6 +3117,7 @@ __export(message_list_exports, {
   clearSearchMode: () => clearSearchMode,
   exitMultiSelect: () => exitMultiSelect,
   getCurrentFocused: () => getCurrentFocused,
+  getCurrentView: () => getCurrentView,
   getDateBasis: () => getDateBasis,
   getSelectedMessages: () => getSelectedMessages,
   initMessageList: () => initMessageList,
@@ -3954,8 +3955,20 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
     body.innerHTML = `<div class="ml-empty">Search error: ${e.message}</div>`;
   }
 }
-function revealMessage(accountId, folderId, uid, specialUse = "") {
-  loadMessages(accountId, folderId, 1, specialUse, true, uid);
+async function revealMessage(accountId, folderId, uid, specialUse = "") {
+  const prevUnified = unifiedMode;
+  const prevAcct = currentAccountId2, prevFolder = currentFolderId, prevSpecial = currentSpecialUse;
+  await loadMessages(accountId, folderId, 1, specialUse, true, uid);
+  if (getMessages2().some((m) => m.accountId === accountId && m.uid === uid))
+    return true;
+  if (!prevUnified && prevAcct && prevFolder)
+    await loadMessages(prevAcct, prevFolder, 1, prevSpecial, true);
+  else
+    await loadUnifiedInbox(true);
+  return false;
+}
+function getCurrentView() {
+  return { unified: unifiedMode, accountId: currentAccountId2, folderId: currentFolderId, specialUse: currentSpecialUse };
 }
 async function loadMessages(accountId, folderId, page = 1, specialUse = "", autoSelect = true, focusUid) {
   const myGen = ++loadGen;
@@ -6571,6 +6584,18 @@ function setFolderSynced(accountId, folderId, syncedAt) {
 function getFolderSynced(accountId, folderId) {
   return folderLastSync.get(syncKey(accountId, folderId));
 }
+function highlightFolder(accountId, folderId) {
+  const el = accountId === null || folderId === -1 ? document.querySelector(".ft-folder.ft-unified") : document.querySelector(`.ft-folder[data-account-id="${CSS.escape(accountId)}"][data-folder-id="${folderId}"]`);
+  if (!el)
+    return null;
+  if (selectedElement)
+    selectedElement.classList.remove("selected");
+  el.classList.add("selected");
+  selectedElement = el;
+  selectedAccountId = accountId;
+  selectedFolderId = folderId;
+  return el.querySelector(".ft-folder-name")?.textContent || null;
+}
 function formatAge(ms) {
   const secs = Math.round(ms / 1e3);
   if (secs < 60)
@@ -9410,19 +9435,31 @@ var currentAccountId3 = "";
 var currentFolderId2 = 0;
 var reloadDebounceTimer = null;
 var lastListReloadAt = 0;
-function closeSearchAndReveal() {
+async function closeSearchAndReveal() {
   const focused = getCurrentFocused();
   clearSearchMode();
   const body = document.getElementById("ml-body");
   if (body) body.querySelectorAll(".filter-hidden").forEach((r) => r.classList.remove("filter-hidden"));
   if (focused && focused.folderId) {
-    currentAccountId3 = focused.accountId;
-    currentFolderId2 = focused.folderId;
-    revealMessage(focused.accountId, focused.folderId, focused.uid);
+    await revealMessage(focused.accountId, focused.folderId, focused.uid);
   } else {
     reloadCurrentFolder();
   }
-  setTitle(APP_NAME);
+  const vw = getCurrentView();
+  if (vw.unified) {
+    highlightFolder(null, -1);
+    setActiveView({ kind: "unified" }, "All Inboxes");
+    setTitle(`${APP_NAME} - All Inboxes`);
+    setNarrowFolderTitle("All Inboxes");
+  } else {
+    currentAccountId3 = vw.accountId;
+    currentFolderId2 = vw.folderId;
+    currentFolderSpecialUse = vw.specialUse;
+    const name = highlightFolder(vw.accountId, vw.folderId) || "Mail";
+    setActiveView({ kind: "folder", accountId: vw.accountId, folderId: vw.folderId, specialUse: vw.specialUse }, name);
+    setTitle(`${APP_NAME} - ${name}`);
+    setNarrowFolderTitle(name);
+  }
 }
 searchInput?.addEventListener("input", () => {
   clearTimeout(searchTimeout);