feat: Fixed allowing folders to drop into normal tabs, b=no-bug, c=tabs

This commit is contained in:
mr. m
2026-01-24 08:58:36 +01:00
parent 1da0bed725
commit 6b255eabec
2 changed files with 14 additions and 6 deletions

View File

@@ -973,13 +973,15 @@
(possibleFolderElement.collapsed ||
possibleFolderElement.childGroupsAndTabs.length < 2)));
if (
isTabGroupLabel(draggedTab) &&
draggedTab.group?.isZenFolder &&
(isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
(!dropElement.pinned || dropElement.hasAttribute("zen-essential"))
(isTabGroupLabel(draggedTab) &&
draggedTab.group?.isZenFolder &&
(isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
(!dropElement.pinned || dropElement.hasAttribute("zen-essential"))) ||
showIndicatorUnderNewTabButton
) {
dropElement = null;
this.clearDragOverVisuals();
return null;
return [dropElement, dropBefore];
}
if (
isTab(dropElement) ||
@@ -994,7 +996,7 @@
let top = 0;
threshold =
Services.prefs.getIntPref("browser.tabs.dragDrop.moveOverThresholdPercent") / 100;
if (overlapPercent > threshold) {
if (overlapPercent > threshold || showIndicatorUnderNewTabButton) {
top = Math.round(rect.top + rect.height) + "px";
dropBefore = false;
} else {

View File

@@ -565,6 +565,12 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
currentEssenialContainer.essentialsPromo.remove();
}
movingTabs = movingTabs.filter((tab) =>
gBrowser.isTabGroupLabel(tab)
? tab.group?.isZenFolder && !tabsTarget && !essentialTabsTarget
: true
);
// TODO: Solve the issue of adding a tab between two groups
// Remove group labels from the moving tabs and replace it
// with the sub tabs