@bobfrankston/rmfmail 1.1.36 → 1.1.38

package/client/app.js

@@ -5,6 +5,7 @@
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
+import { initTabs, setActiveView as setActiveTabView } from "./components/tabs.js";
 import { getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
@@ -420,6 +421,9 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
     loadMessages(accountId, folderId, 1, specialUse);
     setTitle(`${APP_NAME} - ${folderName}`);
     setNarrowFolderTitle(folderName);
+    // Record the navigation in the active tab so a later tab-switch restores
+    // this folder. Folder navigation happens IN the current tab.
+    setActiveTabView({ kind: "folder", accountId, folderId, specialUse }, folderName);
     document.dispatchEvent(new CustomEvent("mailx-folder-changed", { detail: { accountId, folderId } }));
 }, () => {
     // Unified inbox handler
@@ -436,7 +440,44 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
     loadUnifiedInbox();
     setTitle(`${APP_NAME} - All Inboxes`);
     setNarrowFolderTitle("All Inboxes");
+    setActiveTabView({ kind: "unified" }, "All Inboxes");
 });
+// ── View tabs (docs/multi-view.md) ──────────────────────────────────────
+// `applyTabView` loads a tab's view into the single three-pane when the user
+// switches tabs. It mirrors the folder-tree handlers above but must NOT call
+// setActiveTabView (that would be a no-op update, but keeping them separate
+// keeps "user navigated" distinct from "tab restored").
+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;
+        currentAccountId = v.accountId;
+        currentFolderId = 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}`);
+    }
+}
+const tabStripEl = document.getElementById("view-tab-strip");
+if (tabStripEl)
+    initTabs(tabStripEl, applyTabView);
 initMessageList((_accountId, _uid, _folderId) => {
     // The list row's setFocus() already drove the viewer with its own
     // envelope (header + preview paint synchronously, body fetches in
@@ -1878,6 +1919,7 @@ function doSearch(immediate = false) {
     }
     loadSearchResults(query, effectiveScope, currentAccountId, currentFolderId, includeTrash);
     setTitle(`${APP_NAME} - Search: ${query}`);
+    setActiveTabView({ kind: "search", query, scope: effectiveScope, accountId: currentAccountId, folderId: currentFolderId, includeTrash }, `Search: ${query}`);
     // Only record on `immediate=true` (Enter / scope change) — debounced
     // typing would otherwise add every keystroke as its own entry.
     if (immediate)