mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-08-27 17:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Make sure to not lose any tabs when opening from a private window, b=no-bug, c=workspaces

Browse Source
This commit is contained in:
Mr. M
2025-12-07 18:58:04 +01:00
parent f720dce237
commit 307e8fc0ef
5 changed files with 117 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/zen/sessionstore/ZenSessionManager.sys.mjs
View File

@@ -115,6 +115,14 @@ class nsZenSessionManager {
this.#sidebar = sidebarData;
}
#filterUnusedTabs(tabs) {
return tabs.filter((tab) => {
// We need to ignore empty tabs with no group association
// as they are not useful to restore.
return !(tab.zenIsEmpty && !tab.groupId);
});
}
/**
* Collects session data for all tabs in a given window.
*
@@ -137,7 +145,7 @@ class nsZenSessionManager {
}
}
sidebarData.tabs = Array.from(tabIdRelationMap.values());
sidebarData.tabs = this.#filterUnusedTabs(Array.from(tabIdRelationMap.values()));
sidebarData.folders = state.windows[0].folders;
sidebarData.splitViewData = state.windows[0].splitViewData;
@@ -159,19 +167,24 @@ class nsZenSessionManager {
if (aWindow.gZenWorkspaces?.privateWindowOrDisabled) {
return;
}
lazy.SessionSaver.run().then(() => {
lazy.setTimeout(() => {
const state = lazy.SessionStore.getCurrentState(true);
const windows = state.windows || [];
let windowToClone = windows[0];
if (!windowToClone) {
this.restoreWindowData((windowToClone = {}));
}
let newWindow = Cu.cloneInto(windowToClone, {});
delete newWindow.selected;
const newState = { windows: [newWindow] };
SessionStoreInternal.restoreWindows(aWindow, newState, {
firstWindow: true,
aWindow._zenPromiseNewWindowRestored = new Promise((resolve) => {
lazy.SessionSaver.run().then(() => {
lazy.setTimeout(() => {
const state = lazy.SessionStore.getCurrentState(true);
const windows = state.windows || [];
let windowToClone =
windows.find(
(win) => !win.isPrivate && !win.isPopup && !win.isTaskbarTab && !win.isZenUnsynced
) || {};
let newWindow = Cu.cloneInto(windowToClone, {});
this.restoreWindowData(newWindow);
newWindow.tabs = this.#filterUnusedTabs(newWindow.tabs || []);
delete newWindow.selected;
const newState = { windows: [newWindow] };
SessionStoreInternal.restoreWindows(aWindow, newState, {
firstWindow: true,
});
resolve();
});
});
});