mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-01-28 23:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: During session restore insertBefore creates an extra group for (#9899)

Browse Source
This commit is contained in:
octaviusz
2025-08-15 19:26:41 +03:00
committed by GitHub
parent 8c84901598
commit 5dcc6d5f44
1 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/browser/components/tabbrowser/content/tabbrowser-js.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42b1257c3f 100644
index d80a66a01002e78a9c65545d08fe786328ddf124..50ff735a4621110ff3691186139cabf76482a941 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -422,15 +422,60 @@
@@ -293,7 +293,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
}
if (!color) {
@@ -3040,9 +3132,13 @@
@@ -3040,9 +3132,14 @@
label,
isAdoptingGroup
);
@@ -303,13 +303,14 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
+ }
+ group.essential = tabs.some(tab => tab.hasAttribute("essential"));
+ group.pinned = group.essential || tabs.some(tab => tab.pinned);
+ if (forSplitView) insertBefore = insertBefore.group ?? insertBefore;
+ insertBefore.before(
group,
- insertBefore?.group ?? insertBefore
);
group.addTabs(tabs);
@@ -3163,7 +3259,7 @@
@@ -3163,7 +3260,7 @@
}
this.#handleTabMove(tab, () =>
@@ -318,7 +319,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
);
}
@@ -3365,6 +3461,7 @@
@@ -3365,6 +3462,7 @@
openWindowInfo,
skipLoad,
triggeringRemoteType,
@@ -326,7 +327,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
}
) {
// If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
@@ -3434,6 +3531,7 @@
@@ -3434,6 +3532,7 @@
openWindowInfo,
name,
skipLoad,
@@ -334,7 +335,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
});
}
@@ -3621,7 +3719,7 @@
@@ -3621,7 +3720,7 @@
// Add a new tab if needed.
if (!tab) {
let createLazyBrowser =
@@ -343,7 +344,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
let url = "about:blank";
if (tabData.entries?.length) {
@@ -3658,8 +3756,10 @@
@@ -3658,8 +3757,10 @@
insertTab: false,
skipLoad: true,
preferredRemoteType,
@@ -355,7 +356,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (select) {
tabToSelect = tab;
}
@@ -3671,7 +3771,8 @@
@@ -3671,7 +3772,8 @@
this.pinTab(tab);
// Then ensure all the tab open/pinning information is sent.
this._fireTabOpen(tab, {});
@@ -365,7 +366,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
@@ -3685,7 +3786,10 @@
@@ -3685,7 +3787,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@@ -377,7 +378,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
);
tabsFragment.appendChild(tabGroup.node);
}
@@ -3730,9 +3834,23 @@
@@ -3730,9 +3835,23 @@
// to remove the old selected tab.
if (tabToSelect) {
let leftoverTab = this.selectedTab;
@@ -393,15 +394,15 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
+ gZenWorkspaces._initialTab._shouldRemove = true;
+ }
+ }
+ }
}
+ else {
+ gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab;
}
+ }
+ this._hasAlreadyInitializedZenSessionStore = true;
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
@@ -3927,7 +4045,7 @@
@@ -3927,7 +4046,7 @@
// Ensure we have an index if one was not provided.
if (typeof elementIndex != "number" && typeof tabIndex != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@@ -410,7 +411,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (
!bulkOrderedOpen &&
((openerTab &&
@@ -3939,7 +4057,7 @@
@@ -3939,7 +4058,7 @@
let lastRelatedTab =
openerTab && this._lastRelatedTabMap.get(openerTab);
let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -419,7 +420,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
tabGroup = previousTab.group;
}
if (
@@ -3950,7 +4068,7 @@
@@ -3950,7 +4069,7 @@
) {
elementIndex = Infinity;
} else if (previousTab.visible) {
@@ -428,7 +429,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
} else if (previousTab == FirefoxViewHandler.tab) {
elementIndex = 0;
}
@@ -3978,14 +4096,14 @@
@@ -3978,14 +4097,14 @@
}
// Ensure index is within bounds.
if (tab.pinned) {
@@ -447,7 +448,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (pinned && !itemAfter?.pinned) {
itemAfter = null;
@@ -3996,7 +4114,7 @@
@@ -3996,7 +4115,7 @@
this.tabContainer._invalidateCachedTabs();
@@ -456,7 +457,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, itemAfter);
@@ -4032,6 +4150,7 @@
@@ -4032,6 +4151,7 @@
if (pinned) {
this._updateTabBarForPinnedTabs();
}
@@ -464,7 +465,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
TabBarVisibility.update();
}
@@ -4321,6 +4440,9 @@
@@ -4321,6 +4441,9 @@
return;
}
@@ -474,7 +475,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
}
@@ -4582,6 +4704,7 @@
@@ -4582,6 +4705,7 @@
telemetrySource,
} = {}
) {
@@ -482,7 +483,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
// When 'closeWindowWithLastTab' pref is enabled, closing all tabs
// can be considered equivalent to closing the window.
if (
@@ -4671,6 +4794,7 @@
@@ -4671,6 +4795,7 @@
if (lastToClose) {
this.removeTab(lastToClose, aParams);
}
@@ -490,7 +491,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
} catch (e) {
console.error(e);
}
@@ -4709,6 +4833,12 @@
@@ -4709,6 +4834,12 @@
aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
}
@@ -503,7 +504,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -4723,6 +4853,9 @@
@@ -4723,6 +4854,9 @@
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
let isLastTab = this.#isLastTabInWindow(aTab);
@@ -513,7 +514,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
@@ -4905,7 +5038,7 @@
@@ -4905,7 +5039,7 @@
closeWindowWithLastTab != null
? closeWindowWithLastTab
: !window.toolbar.visible ||
@@ -522,7 +523,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -4929,6 +5062,7 @@
@@ -4929,6 +5063,7 @@
newTab = true;
}
@@ -530,7 +531,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -4969,13 +5103,7 @@
@@ -4969,13 +5104,7 @@
aTab._mouseleave();
if (newTab) {
@@ -545,7 +546,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
} else {
TabBarVisibility.update();
}
@@ -5108,6 +5236,7 @@
@@ -5108,6 +5237,7 @@
this.tabs[i]._tPos = i;
}
@@ -553,7 +554,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (!this._windowIsClosing) {
// update tab close buttons state
this.tabContainer._updateCloseButtons();
@@ -5320,6 +5449,7 @@
@@ -5320,6 +5450,7 @@
}
let excludeTabs = new Set(aExcludeTabs);
@@ -561,7 +562,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
// If this tab has a successor, it should be selectable, since
// hiding or closing a tab removes that tab as a successor.
@@ -5332,13 +5462,13 @@
@@ -5332,13 +5463,13 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -577,7 +578,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
);
let tab = this.tabContainer.findNextTab(aTab, {
@@ -5354,7 +5484,7 @@
@@ -5354,7 +5485,7 @@
}
if (tab) {
@@ -586,7 +587,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5375,7 +5505,7 @@
@@ -5375,7 +5506,7 @@
});
}
@@ -595,7 +596,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
}
_blurTab(aTab) {
@@ -5777,10 +5907,10 @@
@@ -5777,10 +5908,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -608,7 +609,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -5972,7 +6102,7 @@
@@ -5972,7 +6103,7 @@
* `true` if element is a `<tab-group>`
*/
isTabGroup(element) {
@@ -617,7 +618,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
}
/**
@@ -6049,7 +6179,7 @@
@@ -6049,7 +6180,7 @@
// Don't allow mixing pinned and unpinned tabs.
if (this.isTab(element) && element.pinned) {
@@ -626,7 +627,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
} else {
tabIndex = Math.max(tabIndex, this.pinnedTabCount);
}
@@ -6075,10 +6205,16 @@
@@ -6075,10 +6206,16 @@
this.#handleTabMove(
element,
() => {
@@ -645,7 +646,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
neighbor.after(element);
} else {
@@ -6136,22 +6272,26 @@
@@ -6136,22 +6273,26 @@
#moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
if (this.isTabGroupLabel(targetElement)) {
targetElement = targetElement.group;
@@ -678,7 +679,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
moveBefore = false;
} else if (!element.pinned && targetElement && targetElement.pinned) {
// If the caller asks to move an unpinned element next to a pinned
@@ -6165,14 +6305,18 @@
@@ -6165,14 +6306,18 @@
// move the tab group right before the first unpinned tab.
// 4. Moving a tab group and the first unpinned tab is grouped:
// move the tab group right before the first unpinned tab's tab group.
@@ -698,7 +699,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
element.pinned
? this.tabContainer.pinnedTabsContainer
: this.tabContainer;
@@ -6181,7 +6325,7 @@
@@ -6181,7 +6326,7 @@
element,
() => {
if (moveBefore) {
@@ -707,7 +708,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
} else if (targetElement) {
targetElement.after(element);
} else {
@@ -6230,7 +6374,7 @@
@@ -6230,7 +6375,7 @@
if (!this.isTab(aTab)) {
throw new Error("Can only move a tab into a tab group");
}
@@ -716,7 +717,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
@@ -6324,6 +6468,10 @@
@@ -6324,6 +6469,10 @@
moveActionCallback();
@@ -727,7 +728,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
@@ -7221,7 +7369,7 @@
@@ -7221,7 +7370,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -736,7 +737,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
window.focus();
aEvent.preventDefault();
break;
@@ -8166,6 +8314,7 @@
@@ -8166,6 +8315,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -744,7 +745,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
@@ -9157,7 +9306,7 @@ var TabContextMenu = {
@@ -9157,7 +9307,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -753,7 +754,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..5c784c911fcd30353744a79caad9bb42
// Build Ask Chat items
TabContextMenu.GenAI.buildTabMenu(
document.getElementById("context_askChat"),
@@ -9476,6 +9625,7 @@ var TabContextMenu = {
@@ -9476,6 +9626,7 @@ var TabContextMenu = {
)
);
} else {