Skip to content

Commit e5d4e91

Browse files
committed
fix: Fixed drag and droping split view groups, b=no-bug, c=tabs
1 parent 5787c7d commit e5d4e91

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

src/browser/components/tabbrowser/content/tabbrowser-js.patch

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
2-
index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..1033da146ef5a3463f9fb15168060424b64a64ab 100644
2+
index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..32b3e4cd13c2fffa4630e49f209e382cc1fcac10 100644
33
--- a/browser/components/tabbrowser/content/tabbrowser.js
44
+++ b/browser/components/tabbrowser/content/tabbrowser.js
55
@@ -422,15 +422,49 @@
@@ -603,7 +603,14 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..1033da146ef5a3463f9fb15168060424
603603
if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
604604
neighbor.after(element);
605605
} else {
606-
@@ -6122,7 +6252,7 @@
606+
@@ -6116,13 +6246,13 @@
607+
#moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
608+
if (this.isTabGroupLabel(targetElement)) {
609+
targetElement = targetElement.group;
610+
- if (!moveBefore && !targetElement.collapsed) {
611+
+ if (!moveBefore && !targetElement.collapsed && !targetElement.hasAttribute("split-view-group")) {
612+
// Right after the tab group label = before the first tab in the tab group
613+
targetElement = targetElement.tabs[0];
607614
moveBefore = true;
608615
}
609616
}

src/browser/components/tabbrowser/content/tabs-js.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
2-
index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..bd64221c60aa2c2f4efdf765299ed03077710ff9 100644
2+
index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..d3c0a1ac7f24301e56cb46e83a4d9b8e2ccc453a 100644
33
--- a/browser/components/tabbrowser/content/tabs.js
44
+++ b/browser/components/tabbrowser/content/tabs.js
55
@@ -289,6 +289,7 @@
@@ -409,6 +409,15 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..bd64221c60aa2c2f4efdf765299ed030
409409
? dropElement.parentElement
410410
: dropElement;
411411

412+
@@ -2659,7 +2736,7 @@
413+
if (
414+
isTabGroupLabel(draggedTab) &&
415+
dropElement?.group &&
416+
- !dropElement.group.collapsed
417+
+ !dropElement.group.collapsed && !dropElement.group.hasAttribute("split-view-group")
418+
) {
419+
let overlappedGroup = dropElement.group;
420+
412421
@@ -2686,12 +2763,7 @@
413422
}
414423
}

0 commit comments

Comments
 (0)