corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1953193 - Don't change the selected tab when collapsing a group while dragging it. r=sthompson,tabbrowser-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D241057
This commit is contained in:
Dão Gottwald
2025-03-12 08:19:41 +00:00
parent ddbe423312
commit 125ea7264f
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
browser/components/tabbrowser/content/tabs.js
View File

@@ -286,7 +286,10 @@
// the tab. If no tabs exist outside the group, create a new one and
// select it.
const group = event.target;
if (gBrowser.selectedTab.group === group) {
if (
gBrowser.selectedTab.group === group &&
!this.hasAttribute("movingtab")
) {
gBrowser.selectedTab =
gBrowser._findTabToBlurTo(
gBrowser.selectedTab,
@@ -743,17 +746,18 @@
dt.addElement(tab);
let expandGroupOnDrop;
if (tab.multiselected) {
this.#moveTogetherSelectedTabs(tab);
} else if (
isTabGroupLabel(tab) &&
!tab.group.collapsed &&
gBrowser.visibleTabs.length > tab.group.tabs.length
) {
this._lockTabSizing();
this.#keepTabSizeLocked = true;
tab.group.collapsed = true;
expandGroupOnDrop = true;
if (!fromTabList) {
this.toggleAttribute("movingtab", true);
gNavToolbox.toggleAttribute("movingtab", true);
if (tab.multiselected) {
this.#moveTogetherSelectedTabs(tab);
} else if (isTabGroupLabel(tab) && !tab.group.collapsed) {
this._lockTabSizing();
this.#keepTabSizeLocked = true;
tab.group.collapsed = true;
expandGroupOnDrop = true;
}
}
// Create a canvas to which we capture the current tab.
@@ -2115,14 +2119,6 @@
let dragData = draggedTab._dragData;
let movingTabs = dragData.movingTabs;
if (!this.hasAttribute("movingtab")) {
this.toggleAttribute("movingtab", true);
gNavToolbox.toggleAttribute("movingtab", true);
if (!draggedTab.multiselected) {
this.selectedItem = draggedTab;
}
}
dragData.animLastScreenX ??= dragData.screenX;
dragData.animLastScreenY ??= dragData.screenY;
@@ -2307,14 +2303,6 @@
let dragData = draggedTab._dragData;
let movingTabs = dragData.movingTabs;
if (!this.hasAttribute("movingtab")) {
this.toggleAttribute("movingtab", true);
gNavToolbox.toggleAttribute("movingtab", true);
if (!draggedTab.multiselected) {
this.selectedItem = draggedTab;
}
}
dragData.animLastScreenPos ??= this.verticalMode
? dragData.screenY
: dragData.screenX;