Skip to content

refactor: Improve animation robustness and simplify logic #11737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
octaviusz wants to merge 1 commit into
base: dev
Choose a base branch
from
+45 −83
Draft

refactor: Improve animation robustness and simplify logic #11737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 45 additions & 83 deletions src/zen/folders/ZenFolders.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,12 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
this.setFolderUserIcon(group, stateData.userIcon);
}

// Initialize the tab style
group.tabs.forEach((tab) => {
tab.style.opacity = 1;
tab.style.height = '40px';
Copy link
Member

@mr-cheffy mr-cheffy Dec 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this exactly?

});

if (group.collapsed) {
this.on_TabGroupCollapse({ target: group });
}
Expand Down Expand Up @@ -1167,7 +1173,7 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
}

#collectGroupItems(group, opts = {}) {
const { selectedTabs = [], splitViewIds = new Set(), activeFoldersIds = new Set() } = opts;
const { selectedTabs = [], splitViewIds = new Set() } = opts;
const folders = new Map();
return group.childGroupsAndTabs
.filter((item) => !item.hasAttribute('zen-empty-tab'))
Expand All @@ -1177,14 +1183,11 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
if (!folders.has(group?.id)) {
folders.set(group?.id, group?.activeGroups[0]);
}
const lastActiveFolder = folders.get(group?.id);
const activeFolderId = lastActiveFolder?.id;
const splitViewId = isSplitView ? item?.group?.id : null;

if (item.multiselected || item.selected || item.hasAttribute('folder-active')) {
selectedTabs.push(item);
if (splitViewId) splitViewIds.add(splitViewId);
if (activeFolderId) activeFoldersIds.add(activeFolderId);
}

if (gBrowser.isTabGroupLabel(item)) {
Expand All @@ -1195,7 +1198,7 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
}
}

return { item, splitViewId, activeFolderId };
return { item, splitViewId };
});
}

Expand All @@ -1222,7 +1225,6 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
const animations = [];
const selectedTabs = [];
const splitViewIds = new Set();
const activeFoldersIds = new Set();
const itemsToHide = [];

const tabsContainer = group.querySelector('.tab-group-container');
Expand All @@ -1231,31 +1233,21 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
const groupItems = this.#collectGroupItems(group, {
selectedTabs,
splitViewIds,
activeFoldersIds,
});
const collapsedHeight = this.#calculateHeightShift(tabsContainer, selectedTabs);

if (selectedTabs.length) {
for (let i = 0; i < groupItems.length; i++) {
const { item, splitViewId, activeFolderId } = groupItems[i];
const { item, splitViewId } = groupItems[i];

// Skip selected items
if (selectedTabs.includes(item)) continue;

// Skip items from selected split-view groups
if (splitViewId && splitViewIds.has(splitViewId)) continue;

// Skip items from selected active groups
if (activeFolderId && activeFoldersIds.has(activeFolderId)) {
// If item is tab-group-label-container we should hide it.
// Other items between tab-group-labe-container and folder-active tab should be visible cuz they are hidden by margin-top
if (item.parentElement.id !== activeFolderId && !item.hasAttribute('folder-active')) {
continue;
}
}

if (!itemsToHide.includes(item)) {
itemsToHide.push(item);
if (!item.hasAttribute?.('folder-active')) {
if (!itemsToHide.includes(item)) itemsToHide.push(item);
}
}

Expand All @@ -1268,10 +1260,12 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
}

animations.push(
...this.#createAnimation(
itemsToHide,
{ opacity: [1, 0], height: ['auto', 0] },
{ duration: 0.12, ease: 'easeInOut' }
...itemsToHide.map((item) =>
gZenUIManager.motion.animate(
item,
{ opacity: [item.style.opacity, 0], height: [item.style.height, 0] },
{ duration: 0.12, ease: 'easeInOut' }
)
),
...this.updateFolderIcon(group),
...this.#createAnimation(
Expand All @@ -1294,8 +1288,6 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
if (!selectedTabs.length && !this.#animationCount) {
tabsContainer.setAttribute('hidden', true);
}

this.styleCleanup(itemsToHide);
}

async animateExpand(group) {
Expand All @@ -1316,32 +1308,21 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
const splitViewIds = new Set();
const selectedTabs = folder.activeTabs;

const activeFoldersIds = new Set();
const activeFolderItems = this.#collectGroupItems(folder, {
splitViewIds,
activeFoldersIds,
});

if (selectedTabs.length) {
for (let i = 0; i < activeFolderItems.length; i++) {
const { item, splitViewId, activeFolderId } = activeFolderItems[i];
const { item, splitViewId } = activeFolderItems[i];

// Skip selected items
if (selectedTabs.includes(item)) continue;

// Skip items from selected split-view groups
if (splitViewId && splitViewIds.has(splitViewId)) continue;

if (activeFolderId && activeFoldersIds.has(activeFolderId)) {
const folder = item.parentElement;
if (
gBrowser.isTabGroup(folder) &&
folder.id !== activeFolderId &&
item.hasAttribute('folder-active')
) {
continue;
}
}
if (item.hasAttribute('folder-active')) continue;

if (!itemsToHide.includes(item)) {
itemsToHide.push(item);
Expand Down Expand Up @@ -1384,15 +1365,19 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
};

animations.push(
...this.#createAnimation(
itemsToShow,
{ opacity: '', height: '' },
{ duration: 0.12, ease: 'easeInOut' }
...itemsToShow.map((item) =>
gZenUIManager.motion.animate(
item,
{ opacity: [item.style.opacity, 1], height: [item.style.height, 40] },
{ duration: 0.12, ease: 'easeInOut' }
)
),
...this.#createAnimation(
itemsToHide,
{ opacity: 0, height: 0 },
{ duration: 0.12, ease: 'easeInOut' }
...itemsToHide.map((item) =>
gZenUIManager.motion.animate(
item,
{ opacity: [item.style.opacity, 0], height: [item.style.height, 0] },
{ duration: 0.12, ease: 'easeInOut' }
)
),
...this.updateFolderIcon(group),
...this.#createAnimation(
Expand All @@ -1408,10 +1393,6 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
this.#animationCount += 1;
await Promise.all(animations);
this.#animationCount -= 1;

// Cleanup
this.styleCleanup(itemsToShow);
this.styleCleanup(itemsToHide);
}

async animateUnloadAll(group) {
Expand Down Expand Up @@ -1520,8 +1501,8 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
tabUnloadAnimations = this.#createAnimation(
tabToUnload,
{
opacity: 0,
height: 0,
opacity: [1, 0],
height: [40, 0],
},
{
duration: 0.12,
Expand Down Expand Up @@ -1627,35 +1608,20 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
}
}

// FIXME: This is a hack to fix the animations not working properly
this.styleCleanup(itemsToShow);
itemsToHide.forEach((item) => {
item.style.opacity = 0;
item.style.height = 0;
});

animations.push(
...this.#createAnimation(
itemsToShow,
{
opacity: '',
height: '',
},
{
duration: 0.12,
ease: 'easeInOut',
}
...itemsToShow.map((item) =>
gZenUIManager.motion.animate(
item,
{ opacity: [item.style.opacity, 1], height: [item.style.height, 40] },
{ duration: 0.12, ease: 'easeInOut' }
)
),
...this.#createAnimation(
itemsToHide,
{
opacity: 0,
height: 0,
},
{
duration: 0.12,
ease: 'easeInOut',
}
...itemsToHide.map((item) =>
gZenUIManager.motion.animate(
item,
{ opacity: [item.style.opacity, 0], height: [item.style.height, 0] },
{ duration: 0.12, ease: 'easeInOut' }
)
)
);

Expand All @@ -1665,10 +1631,6 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
if (this.#animationCount) {
return;
}

// Cleanup
this.styleCleanup(itemsToHide);
this.styleCleanup(selectedTabs);
}

animateGroupMove(group, expand = false) {
Expand Down