mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-15 06:16:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Revert to the new folder animation, p=#10783, c=folders

Browse Source
This commit is contained in:
mr. m
2025-10-12 11:37:18 +02:00
committed by GitHub
parent 6a6fd4be1c
commit 07661ea19a
6 changed files with 693 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..5b0f46642e36fd3e15d13a8dbc633c7a9751f8aa 100644 index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..12988986c4cf00990c1d1b2e4be362efc001afdd 100644
--- a/browser/components/tabbrowser/content/tab.js --- a/browser/components/tabbrowser/content/tab.js
+++ b/browser/components/tabbrowser/content/tab.js +++ b/browser/components/tabbrowser/content/tab.js
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@@ -65,7 +65,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..5b0f46642e36fd3e15d13a8dbc633c7a
+ } + }
+ +
+ // Selected tabs are always visible + // Selected tabs are always visible
+ if ((this.selected || this.multiselected || this.hasAttribute("folder-active")) && !this.hasAttribute("was-folder-active")) return true; + if (this.selected || this.multiselected || this.hasAttribute("folder-active")) return true;
+ // Recursively check all parent groups + // Recursively check all parent groups
+ let currentParent = this.group; + let currentParent = this.group;
+ while (currentParent) { + while (currentParent) {
@@ -138,7 +138,7 @@ index 425aaf8c8e4adf1507eb0d8ded671f8295544b04..5b0f46642e36fd3e15d13a8dbc633c7a
+ gZenPinnedTabManager._onTabResetPinButton(event, this, 'reset'); + gZenPinnedTabManager._onTabResetPinButton(event, this, 'reset');
+ gBrowser.tabContainer._blockDblClick = true; + gBrowser.tabContainer._blockDblClick = true;
+ } else if (event.target.classList.contains("tab-reset-button")) { + } else if (event.target.classList.contains("tab-reset-button")) {
+ gZenPinnedTabManager._onCloseTabShortcut(event, this); + gZenPinnedTabManager.onCloseTabShortcut(event, this);
+ gBrowser.tabContainer._blockDblClick = true; + gBrowser.tabContainer._blockDblClick = true;
+ } + }
} }

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

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b19b606e9 100644 index 1425607ef87d6c28fb676e722617edfb51ba12a1..8431ed0ab80e1e08fa622633d86e52915a44c9b1 100644
--- a/browser/components/tabbrowser/content/tabs.js --- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js +++ b/browser/components/tabbrowser/content/tabs.js
@@ -44,6 +44,9 @@ @@ -44,6 +44,9 @@
@@ -70,7 +70,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
if (collapseTabGroupDuringDrag) { if (collapseTabGroupDuringDrag) {
tab.group.collapsed = true; tab.group.collapsed = true;
+ gZenFolders.collapseVisibleTab(tab.group); + gZenFolders.animateGroupMove(tab.group);
} }
} }
} }
@@ -85,7 +85,17 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
if ( if (
(dropEffect == "move" || dropEffect == "copy") && (dropEffect == "move" || dropEffect == "copy") &&
document == draggedTab.ownerDocument && document == draggedTab.ownerDocument &&
@@ -1208,6 +1218,18 @@ @@ -1154,7 +1164,8 @@
isTabGroupLabel(draggedTab) &&
draggedTab._dragData?.expandGroupOnDrop
) {
- draggedTab.group.collapsed = false;
+ draggedTab.group.collapsed = draggedTab.group.hasAttribute("has-active");
+ gZenFolders.animateGroupMove(draggedTab.group, true);
}
}
@@ -1208,6 +1219,18 @@
this._tabDropIndicator.hidden = true; this._tabDropIndicator.hidden = true;
event.stopPropagation(); event.stopPropagation();
@@ -104,7 +114,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
if (draggedTab && dropEffect == "copy") { if (draggedTab && dropEffect == "copy") {
let duplicatedDraggedTab; let duplicatedDraggedTab;
let duplicatedTabs = []; let duplicatedTabs = [];
@@ -1232,8 +1254,9 @@ @@ -1232,8 +1255,9 @@
let translateOffsetY = oldTranslateY % tabHeight; let translateOffsetY = oldTranslateY % tabHeight;
let newTranslateX = oldTranslateX - translateOffsetX; let newTranslateX = oldTranslateX - translateOffsetX;
let newTranslateY = oldTranslateY - translateOffsetY; let newTranslateY = oldTranslateY - translateOffsetY;
@@ -116,7 +126,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
if (this.#isContainerVerticalPinnedGrid(draggedTab)) { if (this.#isContainerVerticalPinnedGrid(draggedTab)) {
// Update both translate axis for pinned vertical expanded tabs // Update both translate axis for pinned vertical expanded tabs
@@ -1249,8 +1272,8 @@ @@ -1249,8 +1273,8 @@
} }
} else { } else {
let tabs = this.ariaFocusableItems.slice( let tabs = this.ariaFocusableItems.slice(
@@ -127,7 +137,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
); );
let size = this.verticalMode ? "height" : "width"; let size = this.verticalMode ? "height" : "width";
let screenAxis = this.verticalMode ? "screenY" : "screenX"; let screenAxis = this.verticalMode ? "screenY" : "screenX";
@@ -1299,11 +1322,13 @@ @@ -1299,11 +1323,13 @@
this.dragToPinPromoCard, this.dragToPinPromoCard,
]; ];
let shouldPin = let shouldPin =
@@ -141,7 +151,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
isTab(draggedTab) && isTab(draggedTab) &&
draggedTab.pinned && draggedTab.pinned &&
this.arrowScrollbox.contains(event.target); this.arrowScrollbox.contains(event.target);
@@ -1321,6 +1346,7 @@ @@ -1321,6 +1347,7 @@
(oldTranslateY && oldTranslateY != newTranslateY); (oldTranslateY && oldTranslateY != newTranslateY);
} else if (this.verticalMode) { } else if (this.verticalMode) {
shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY; shouldTranslate &&= oldTranslateY && oldTranslateY != newTranslateY;
@@ -149,7 +159,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} else { } else {
shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX; shouldTranslate &&= oldTranslateX && oldTranslateX != newTranslateX;
} }
@@ -1515,6 +1541,7 @@ @@ -1515,6 +1542,7 @@
let nextItem = this.ariaFocusableItems[newIndex]; let nextItem = this.ariaFocusableItems[newIndex];
let tabGroup = isTab(nextItem) && nextItem.group; let tabGroup = isTab(nextItem) && nextItem.group;
@@ -157,7 +167,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
gBrowser.loadTabs(urls, { gBrowser.loadTabs(urls, {
inBackground, inBackground,
replace, replace,
@@ -1553,6 +1580,17 @@ @@ -1553,6 +1581,17 @@
} }
this.#resetTabsAfterDrop(draggedTab.ownerDocument); this.#resetTabsAfterDrop(draggedTab.ownerDocument);
@@ -175,7 +185,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
if ( if (
dt.mozUserCancelled || dt.mozUserCancelled ||
dt.dropEffect != "none" || dt.dropEffect != "none" ||
@@ -1719,7 +1757,6 @@ @@ -1719,7 +1758,6 @@
this.toggleAttribute("overflow", true); this.toggleAttribute("overflow", true);
this._updateCloseButtons(); this._updateCloseButtons();
@@ -183,7 +193,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
document document
.getElementById("tab-preview-panel") .getElementById("tab-preview-panel")
@@ -1777,7 +1814,7 @@ @@ -1777,7 +1815,7 @@
} }
get newTabButton() { get newTabButton() {
@@ -192,7 +202,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
get verticalMode() { get verticalMode() {
@@ -1793,6 +1830,7 @@ @@ -1793,6 +1831,7 @@
} }
get overflowing() { get overflowing() {
@@ -200,7 +210,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
return this.hasAttribute("overflow"); return this.hasAttribute("overflow");
} }
@@ -1806,29 +1844,54 @@ @@ -1806,29 +1845,54 @@
if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") { if (pinnedChildren?.at(-1)?.id == "pinned-tabs-container-periphery") {
pinnedChildren.pop(); pinnedChildren.pop();
} }
@@ -265,7 +275,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
/** /**
@@ -1895,29 +1958,23 @@ @@ -1895,29 +1959,23 @@
let elementIndex = 0; let elementIndex = 0;
@@ -304,7 +314,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
} }
@@ -1929,6 +1986,7 @@ @@ -1929,6 +1987,7 @@
_invalidateCachedTabs() { _invalidateCachedTabs() {
this.#allTabs = null; this.#allTabs = null;
this._invalidateCachedVisibleTabs(); this._invalidateCachedVisibleTabs();
@@ -312,7 +322,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
_invalidateCachedVisibleTabs() { _invalidateCachedVisibleTabs() {
@@ -1944,8 +2002,8 @@ @@ -1944,8 +2003,8 @@
#isContainerVerticalPinnedGrid(tab) { #isContainerVerticalPinnedGrid(tab) {
return ( return (
this.verticalMode && this.verticalMode &&
@@ -323,7 +333,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
!this.expandOnHover !this.expandOnHover
); );
} }
@@ -1961,7 +2019,7 @@ @@ -1961,7 +2020,7 @@
if (node == null) { if (node == null) {
// We have a container for non-tab elements at the end of the scrollbox. // We have a container for non-tab elements at the end of the scrollbox.
@@ -332,7 +342,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
node.before(tab); node.before(tab);
@@ -2056,7 +2114,7 @@ @@ -2056,7 +2115,7 @@
// There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and // There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
// for when the tab strip is overflowed (which is shared by vertical and horizontal tabs); // for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
// Attach the long click popup to all of them. // Attach the long click popup to all of them.
@@ -341,7 +351,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
const newTab2 = this.newTabButton; const newTab2 = this.newTabButton;
const newTabVertical = document.getElementById( const newTabVertical = document.getElementById(
"vertical-tabs-newtab-button" "vertical-tabs-newtab-button"
@@ -2156,8 +2214,10 @@ @@ -2156,8 +2215,10 @@
*/ */
_handleTabSelect(aInstant) { _handleTabSelect(aInstant) {
let selectedTab = this.selectedItem; let selectedTab = this.selectedItem;
@@ -352,7 +362,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
selectedTab._notselectedsinceload = false; selectedTab._notselectedsinceload = false;
} }
@@ -2166,7 +2226,7 @@ @@ -2166,7 +2227,7 @@
* @param {boolean} [shouldScrollInstantly=false] * @param {boolean} [shouldScrollInstantly=false]
*/ */
#ensureTabIsVisible(tab, shouldScrollInstantly = false) { #ensureTabIsVisible(tab, shouldScrollInstantly = false) {
@@ -361,7 +371,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
if (arrowScrollbox?.overflowing) { if (arrowScrollbox?.overflowing) {
arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly); arrowScrollbox.ensureElementIsVisible(tab, shouldScrollInstantly);
} }
@@ -2305,6 +2365,16 @@ @@ -2305,6 +2366,16 @@
when the tab is first selected to be dragged. when the tab is first selected to be dragged.
*/ */
#updateTabStylesOnDrag(tab) { #updateTabStylesOnDrag(tab) {
@@ -378,7 +388,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
let isPinned = tab.pinned; let isPinned = tab.pinned;
let numPinned = gBrowser.pinnedTabCount; let numPinned = gBrowser.pinnedTabCount;
let allTabs = this.ariaFocusableItems; let allTabs = this.ariaFocusableItems;
@@ -2578,7 +2648,7 @@ @@ -2578,7 +2649,7 @@
return; return;
} }
@@ -387,7 +397,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
let directionX = screenX > dragData.animLastScreenX; let directionX = screenX > dragData.animLastScreenX;
let directionY = screenY > dragData.animLastScreenY; let directionY = screenY > dragData.animLastScreenY;
@@ -2587,6 +2657,8 @@ @@ -2587,6 +2658,8 @@
let { width: tabWidth, height: tabHeight } = let { width: tabWidth, height: tabHeight } =
draggedTab.getBoundingClientRect(); draggedTab.getBoundingClientRect();
@@ -396,7 +406,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
let shiftSizeX = tabWidth * movingTabs.length; let shiftSizeX = tabWidth * movingTabs.length;
let shiftSizeY = tabHeight; let shiftSizeY = tabHeight;
dragData.tabWidth = tabWidth; dragData.tabWidth = tabWidth;
@@ -2623,8 +2695,8 @@ @@ -2623,8 +2696,8 @@
let lastBoundX = let lastBoundX =
lastTabInRow.screenX + lastTabInRow.screenX +
lastTabInRow.getBoundingClientRect().width - lastTabInRow.getBoundingClientRect().width -
@@ -407,7 +417,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX); translateX = Math.min(Math.max(translateX, firstBoundX), lastBoundX);
translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY); translateY = Math.min(Math.max(translateY, firstBoundY), lastBoundY);
@@ -2782,13 +2854,18 @@ @@ -2782,13 +2855,18 @@
this.#clearDragOverGroupingTimer(); this.#clearDragOverGroupingTimer();
this.#clearPinnedDropIndicatorTimer(); this.#clearPinnedDropIndicatorTimer();
@@ -430,7 +440,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
if (this.#rtlMode) { if (this.#rtlMode) {
tabs.reverse(); tabs.reverse();
@@ -2799,7 +2876,7 @@ @@ -2799,7 +2877,7 @@
let screenAxis = this.verticalMode ? "screenY" : "screenX"; let screenAxis = this.verticalMode ? "screenY" : "screenX";
let size = this.verticalMode ? "height" : "width"; let size = this.verticalMode ? "height" : "width";
let translateAxis = this.verticalMode ? "translateY" : "translateX"; let translateAxis = this.verticalMode ? "translateY" : "translateX";
@@ -439,7 +449,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
let tabSize = this.verticalMode ? tabHeight : tabWidth; let tabSize = this.verticalMode ? tabHeight : tabWidth;
let translateX = event.screenX - dragData.screenX; let translateX = event.screenX - dragData.screenX;
let translateY = event.screenY - dragData.screenY; let translateY = event.screenY - dragData.screenY;
@@ -2815,6 +2892,12 @@ @@ -2815,6 +2893,12 @@
); );
let lastMovingTab = movingTabs.at(-1); let lastMovingTab = movingTabs.at(-1);
let firstMovingTab = movingTabs[0]; let firstMovingTab = movingTabs[0];
@@ -452,7 +462,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
let endEdge = ele => ele[screenAxis] + bounds(ele)[size]; let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
let lastMovingTabScreen = endEdge(lastMovingTab); let lastMovingTabScreen = endEdge(lastMovingTab);
let firstMovingTabScreen = firstMovingTab[screenAxis]; let firstMovingTabScreen = firstMovingTab[screenAxis];
@@ -2829,6 +2912,11 @@ @@ -2829,6 +2913,11 @@
let endBound = this.#rtlMode let endBound = this.#rtlMode
? endEdge(this) - lastMovingTabScreen ? endEdge(this) - lastMovingTabScreen
: periphery[screenAxis] - 1 - lastMovingTabScreen; : periphery[screenAxis] - 1 - lastMovingTabScreen;
@@ -464,7 +474,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
translate = Math.min(Math.max(translate, startBound), endBound); translate = Math.min(Math.max(translate, startBound), endBound);
// Center the tab under the cursor if the tab is not under the cursor while dragging // Center the tab under the cursor if the tab is not under the cursor while dragging
@@ -3018,6 +3106,8 @@ @@ -3018,6 +3107,8 @@
}; };
let dropElement = getOverlappedElement(); let dropElement = getOverlappedElement();
@@ -473,7 +483,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
let newDropElementIndex; let newDropElementIndex;
if (dropElement) { if (dropElement) {
@@ -3099,7 +3189,7 @@ @@ -3099,7 +3190,7 @@
? Services.prefs.getIntPref( ? Services.prefs.getIntPref(
"browser.tabs.dragDrop.moveOverThresholdPercent" "browser.tabs.dragDrop.moveOverThresholdPercent"
) / 100 ) / 100
@@ -482,7 +492,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold)); moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
let shouldMoveOver = overlapPercent > moveOverThreshold; let shouldMoveOver = overlapPercent > moveOverThreshold;
if (logicalForward && shouldMoveOver) { if (logicalForward && shouldMoveOver) {
@@ -3132,6 +3222,7 @@ @@ -3132,6 +3223,7 @@
// If dragging a group over another group, don't make it look like it is // If dragging a group over another group, don't make it look like it is
// possible to drop the dragged group inside the other group. // possible to drop the dragged group inside the other group.
if ( if (
@@ -490,7 +500,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
isTabGroupLabel(draggedTab) && isTabGroupLabel(draggedTab) &&
dropElement?.group && dropElement?.group &&
(!dropElement.group.collapsed || (!dropElement.group.collapsed ||
@@ -3158,20 +3249,13 @@ @@ -3158,20 +3250,13 @@
let isOutOfBounds = isPinned let isOutOfBounds = isPinned
? dropElement.elementIndex >= numPinned ? dropElement.elementIndex >= numPinned
: dropElement.elementIndex < numPinned; : dropElement.elementIndex < numPinned;
@@ -515,7 +525,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
let groupingDelay = Services.prefs.getIntPref( let groupingDelay = Services.prefs.getIntPref(
"browser.tabs.dragDrop.createGroup.delayMS" "browser.tabs.dragDrop.createGroup.delayMS"
); );
@@ -3179,6 +3263,7 @@ @@ -3179,6 +3264,7 @@
// When dragging tab(s) over an ungrouped tab, signal to the user // When dragging tab(s) over an ungrouped tab, signal to the user
// that dropping the tab(s) will create a new tab group. // that dropping the tab(s) will create a new tab group.
let shouldCreateGroupOnDrop = let shouldCreateGroupOnDrop =
@@ -523,7 +533,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
!movingTabsSet.has(dropElement) && !movingTabsSet.has(dropElement) &&
isTab(dropElement) && isTab(dropElement) &&
!dropElement?.group && !dropElement?.group &&
@@ -3187,6 +3272,7 @@ @@ -3187,6 +3273,7 @@
// When dragging tab(s) over a collapsed tab group label, signal to the // When dragging tab(s) over a collapsed tab group label, signal to the
// user that dropping the tab(s) will add them to the group. // user that dropping the tab(s) will add them to the group.
let shouldDropIntoCollapsedTabGroup = let shouldDropIntoCollapsedTabGroup =
@@ -531,7 +541,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
isTabGroupLabel(dropElement) && isTabGroupLabel(dropElement) &&
dropElement.group.collapsed && dropElement.group.collapsed &&
overlapPercent > dragOverGroupingThreshold; overlapPercent > dragOverGroupingThreshold;
@@ -3231,19 +3317,14 @@ @@ -3231,19 +3318,14 @@
dropElement = dropElementGroup; dropElement = dropElementGroup;
colorCode = undefined; colorCode = undefined;
} else if (isTabGroupLabel(dropElement)) { } else if (isTabGroupLabel(dropElement)) {
@@ -559,7 +569,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
this.#setDragOverGroupColor(colorCode); this.#setDragOverGroupColor(colorCode);
this.toggleAttribute("movingtab-addToGroup", colorCode); this.toggleAttribute("movingtab-addToGroup", colorCode);
@@ -3262,11 +3343,11 @@ @@ -3262,11 +3344,11 @@
dragData.dropElement = dropElement; dragData.dropElement = dropElement;
dragData.dropBefore = dropBefore; dragData.dropBefore = dropBefore;
dragData.animDropElementIndex = newDropElementIndex; dragData.animDropElementIndex = newDropElementIndex;
@@ -573,7 +583,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
continue; continue;
} }
@@ -3388,12 +3469,14 @@ @@ -3388,12 +3470,14 @@
element?.removeAttribute("dragover-groupTarget"); element?.removeAttribute("dragover-groupTarget");
} }
@@ -590,7 +600,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
for (let item of this.ariaFocusableItems) { for (let item of this.ariaFocusableItems) {
this.#resetGroupTarget(item); this.#resetGroupTarget(item);
@@ -3440,7 +3523,7 @@ @@ -3440,7 +3524,7 @@
tab.style.left = ""; tab.style.left = "";
tab.style.top = ""; tab.style.top = "";
tab.style.maxWidth = ""; tab.style.maxWidth = "";
@@ -599,7 +609,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
for (let label of draggedTabDocument.getElementsByClassName( for (let label of draggedTabDocument.getElementsByClassName(
"tab-group-label-container" "tab-group-label-container"
@@ -3450,7 +3533,7 @@ @@ -3450,7 +3534,7 @@
label.style.left = ""; label.style.left = "";
label.style.top = ""; label.style.top = "";
label.style.maxWidth = ""; label.style.maxWidth = "";
@@ -608,7 +618,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
} }
let periphery = draggedTabDocument.getElementById( let periphery = draggedTabDocument.getElementById(
"tabbrowser-arrowscrollbox-periphery" "tabbrowser-arrowscrollbox-periphery"
@@ -3522,7 +3605,7 @@ @@ -3522,7 +3606,7 @@
let postTransitionCleanup = () => { let postTransitionCleanup = () => {
movingTab._moveTogetherSelectedTabsData.animate = false; movingTab._moveTogetherSelectedTabsData.animate = false;
}; };
@@ -617,7 +627,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
postTransitionCleanup(); postTransitionCleanup();
} else { } else {
let onTransitionEnd = transitionendEvent => { let onTransitionEnd = transitionendEvent => {
@@ -3686,7 +3769,7 @@ @@ -3686,7 +3770,7 @@
} }
_notifyBackgroundTab(aTab) { _notifyBackgroundTab(aTab) {
@@ -626,7 +636,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
return; return;
} }
@@ -3795,7 +3878,10 @@ @@ -3795,7 +3879,10 @@
#getDragTarget(event, { ignoreSides = false } = {}) { #getDragTarget(event, { ignoreSides = false } = {}) {
let { target } = event; let { target } = event;
while (target) { while (target) {
@@ -638,7 +648,7 @@ index 1425607ef87d6c28fb676e722617edfb51ba12a1..62431aa1c78c8327edf2c8c93472cb8b
break; break;
} }
target = target.parentNode; target = target.parentNode;
@@ -3812,6 +3898,9 @@ @@ -3812,6 +3899,9 @@
return null; return null;
} }
} }

14
src/zen/folders/ZenFolder.mjs
View File

@@ -117,6 +117,10 @@
return activeGroups; return activeGroups;
} }
get childActiveGroups() {
return Array.from(this.querySelectorAll('zen-folder[has-active]'));
}
rename() { rename() {
if (!document.documentElement.hasAttribute('zen-sidebar-expanded')) { if (!document.documentElement.hasAttribute('zen-sidebar-expanded')) {
return; return;
@@ -240,16 +244,18 @@
} }
async #unloadAllActiveTabs(event, noClose = false) { async #unloadAllActiveTabs(event, noClose = false) {
for (const tab of this.tabs) { await gZenPinnedTabManager.onCloseTabShortcut(event, this.tabs, {
await gZenPinnedTabManager._onCloseTabShortcut(event, tab, { noClose }); noClose,
} alwaysUnload: true,
folderToUnload: this,
});
this.activeTabs = []; this.activeTabs = [];
} }
on_click(event) { on_click(event) {
if (event.target === this.resetButton) { if (event.target === this.resetButton) {
event.stopPropagation(); event.stopPropagation();
this.#unloadAllActiveTabs(event); this.unloadAllTabs(event);
return; return;
} }
super.on_click(event); super.on_click(event);

1134
src/zen/folders/ZenFolders.mjs
View File

File diff suppressed because it is too large Load Diff

2
src/zen/folders/zen-folders.css
View File

@@ -207,7 +207,7 @@ zen-folder {
display: flex; display: flex;
} }
& > .tab-group-container { &:not([has-active]) > .tab-group-container {
overflow-y: clip; overflow-y: clip;
} }
} }

86
src/zen/tabs/ZenPinnedTabManager.mjs
View File

@@ -639,7 +639,7 @@
async _onTabClick(e) { async _onTabClick(e) {
const tab = e.target?.closest('tab'); const tab = e.target?.closest('tab');
if (e.button === 1 && tab) { if (e.button === 1 && tab) {
await this._onCloseTabShortcut(e, tab, { await this.onCloseTabShortcut(e, tab, {
closeIfPending: Services.prefs.getBoolPref( closeIfPending: Services.prefs.getBoolPref(
'zen.pinned-tab-manager.wheel-close-if-pending' 'zen.pinned-tab-manager.wheel-close-if-pending'
), ),
@@ -769,7 +769,7 @@
let cmdClose = document.getElementById('cmd_close'); let cmdClose = document.getElementById('cmd_close');
if (cmdClose) { if (cmdClose) {
cmdClose.addEventListener('command', this._onCloseTabShortcut.bind(this)); cmdClose.addEventListener('command', this.onCloseTabShortcut.bind(this));
} }
} }
@@ -788,20 +788,38 @@
await ZenPinnedTabsStorage.savePin(pin, notifyObservers); await ZenPinnedTabsStorage.savePin(pin, notifyObservers);
} }
async _onCloseTabShortcut( async onCloseTabShortcut(
event, event,
selectedTab = gBrowser.selectedTab, selectedTab = gBrowser.selectedTab,
{ {
behavior = lazy.zenPinnedTabCloseShortcutBehavior, behavior = lazy.zenPinnedTabCloseShortcutBehavior,
noClose = false, noClose = false,
closeIfPending = false, closeIfPending = false,
alwaysUnload = false,
folderToUnload = null,
} = {} } = {}
) { ) {
try { try {
if (!selectedTab?.pinned) { const tabs = Array.isArray(selectedTab) ? selectedTab : [selectedTab];
const pinnedTabs = [
...new Set(
tabs
.flatMap((tab) => {
if (tab.group?.hasAttribute('split-view-group')) {
return tab.group.tabs;
}
return tab;
})
.filter((tab) => tab?.pinned)
),
];
if (!pinnedTabs.length) {
return; return;
} }
const selectedTabs = pinnedTabs.filter((tab) => tab.selected);
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
@@ -809,21 +827,29 @@
behavior = 'unload-switch'; behavior = 'unload-switch';
} }
if (alwaysUnload && ['close', 'reset', 'switch', 'reset-switch'].includes(behavior)) {
behavior = behavior.contains('reset') ? 'reset-unload-switch' : 'unload-switch';
}
switch (behavior) { switch (behavior) {
case 'close': case 'close': {
this._removePinnedAttributes(selectedTab, true); for (const tab of pinnedTabs) {
gBrowser.removeTab(selectedTab, { animate: true }); this._removePinnedAttributes(tab, true);
gBrowser.removeTab(tab, { animate: true });
}
break; break;
}
case 'reset-unload-switch': case 'reset-unload-switch':
case 'unload-switch': case 'unload-switch':
case 'reset-switch': case 'reset-switch':
case 'switch': case 'switch':
if (behavior.includes('unload')) { if (behavior.includes('unload')) {
if (selectedTab.hasAttribute('glance-id')) { for (const tab of pinnedTabs) {
if (tab.hasAttribute('glance-id')) {
// We have a glance tab inside the tab we are trying to unload, // We have a glance tab inside the tab we are trying to unload,
// before we used to just ignore it but now we need to fully close // before we used to just ignore it but now we need to fully close
// it as well. // it as well.
gZenGlanceManager.manageTabClose(selectedTab.glanceTab); gZenGlanceManager.manageTabClose(tab.glanceTab);
await new Promise((resolve) => { await new Promise((resolve) => {
let hasRan = false; let hasRan = false;
const onGlanceClose = () => { const onGlanceClose = () => {
@@ -842,33 +868,41 @@
}, 3000); }, 3000);
}); });
} }
await gZenFolders.collapseVisibleTab( const isSpltView = tab.group?.hasAttribute('split-view-group');
selectedTab.group, const group = isSpltView ? tab.group.group : tab.group;
/* only if active */ true, if (!folderToUnload && tab.hasAttribute('folder-active')) {
selectedTab await gZenFolders.animateUnload(group, tab);
);
let tabsToUnload = [selectedTab];
if (selectedTab.group?.hasAttribute('split-view-group')) {
tabsToUnload = selectedTab.group.tabs;
} }
const allAreUnloaded = tabsToUnload.every( }
if (folderToUnload) {
await gZenFolders.animateUnloadAll(folderToUnload);
}
const allAreUnloaded = pinnedTabs.every(
(tab) => tab.hasAttribute('pending') && !tab.hasAttribute('zen-essential') (tab) => tab.hasAttribute('pending') && !tab.hasAttribute('zen-essential')
); );
for (const tab of pinnedTabs) {
if (allAreUnloaded && closeIfPending) { if (allAreUnloaded && closeIfPending) {
return await this._onCloseTabShortcut(event, selectedTab, { behavior: 'close' }); return await this._onCloseTabShortcut(event, tab, { behavior: 'close' });
} }
await gBrowser.explicitUnloadTabs(tabsToUnload);
selectedTab.removeAttribute('discarded');
} }
if (selectedTab.selected) { await gBrowser.explicitUnloadTabs(pinnedTabs);
this._handleTabSwitch(selectedTab); for (const tab of pinnedTabs) {
tab.removeAttribute('discarded');
}
}
if (selectedTabs.length) {
this._handleTabSwitch(selectedTabs[0]);
} }
if (behavior.includes('reset')) { if (behavior.includes('reset')) {
this._resetTabToStoredState(selectedTab); for (const tab of pinnedTabs) {
this._resetTabToStoredState(tab);
}
} }
break; break;
case 'reset': case 'reset':
this._resetTabToStoredState(selectedTab); for (const tab of pinnedTabs) {
this._resetTabToStoredState(tab);
}
break; break;
default: default:
return; return;
@@ -1279,7 +1313,7 @@
let isVisible = true; let isVisible = true;
let parent = item.group; let parent = item.group;
while (parent) { while (parent) {
if (parent.collapsed && !parent.hasAttribute('has-active')) { if (!parent.visible) {
isVisible = false; isVisible = false;
break; break;
} }