fix: Small fixes to folders, b=no-bug, c=tabs, common, folders

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0947aa55a 100644
+index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..9022f3f566e8829fa8d3c5a58f0300ab96869073 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -289,6 +289,7 @@
@@ -360,11 +360,11 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
 +      let isPinned = draggedTab?.group ? draggedTab.group.pinned : draggedTab.pinned;
 +      let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
 +      let essential = draggedTab.hasAttribute("zen-essential");
-+      const isDraggingFolder = isTabGroupLabel(draggedTab) || draggedTab.group?.isZenFolder;
++      const isDraggingFolder = isTabGroupLabel(draggedTab) && draggedTab.group?.isZenFolder;
        let tabs = this.ariaFocusableItems.slice(
 -        isPinned ? 0 : numPinned,
 -        isPinned ? numPinned : undefined
-+        isPinned ? (essential ? 0 : gBrowser._numZenEssentials) : undefined,
++        (isPinned && essential) ? 0 : gBrowser._numZenEssentials,
 +        isPinned ? (essential ? gBrowser._numZenEssentials : (isDraggingFolder ? numPinned : undefined)) : undefined
        );
 +      if (draggedTab.group?.hasAttribute("split-view-group")) {
@@ -457,7 +457,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
          moveOverThreshold = Math.min(1, Math.max(0, moveOverThreshold));
          let shouldMoveOver = overlapPercent > moveOverThreshold;
          if (logicalForward && shouldMoveOver) {
-@@ -2656,23 +2738,6 @@
+@@ -2656,44 +2738,21 @@
  
          // 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.
@@ -481,8 +481,14 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
  
          // Constrain drop direction at the boundary between pinned and
          // unpinned tabs so that they don't mix together.
-@@ -2686,14 +2751,13 @@
-         }
+         let isOutOfBounds = isPinned
+           ? dropElement.elementIndex >= numPinned
+           : dropElement.elementIndex < numPinned;
+-        if (isOutOfBounds) {
+-          // Drop after last pinned tab
+-          dropElement = this.ariaFocusableItems[numPinned - 1];
+-          dropBefore = false;
+-        }
        }
  
 -      if (
@@ -501,7 +507,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
          // When dragging tab(s) over an ungrouped tab, signal to the user
          // that dropping the tab(s) will create a new tab group.
          shouldCreateGroupOnDrop =
-@@ -2703,12 +2767,6 @@
+@@ -2703,12 +2762,6 @@
            overlapPercent > dragOverGroupingThreshold;
  
          if (shouldCreateGroupOnDrop) {
@@ -514,7 +520,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
          } else {
            this.removeAttribute("movingtab-createGroup");
            document
-@@ -2735,19 +2793,14 @@
+@@ -2735,19 +2788,14 @@
              dropElement = dropElementGroup;
              colorCode = undefined;
            } else if (isTabGroupLabel(dropElement)) {
@@ -542,7 +548,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
            }
            this.#setDragOverGroupColor(colorCode);
            this.toggleAttribute("movingtab-ungroup", !colorCode);
-@@ -2769,15 +2822,24 @@
+@@ -2769,15 +2817,24 @@
        // Shift background tabs to leave a gap where the dragged tab
        // would currently be dropped.
        for (let item of tabs) {
@@ -568,7 +574,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
          }
          item.style.transform = transform;
        }
-@@ -2830,12 +2892,14 @@
+@@ -2830,12 +2887,14 @@
        );
      }
  
@@ -585,7 +591,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
  
        for (let item of this.ariaFocusableItems) {
          if (isTabGroupLabel(item)) {
-@@ -2843,6 +2907,18 @@
+@@ -2843,6 +2902,18 @@
            item = item.parentElement;
          }
          item.style.transform = "";
@@ -604,7 +610,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
          item.removeAttribute("dragover-createGroup");
        }
        this.removeAttribute("movingtab-createGroup");
-@@ -2889,7 +2965,7 @@
+@@ -2889,7 +2960,7 @@
          let postTransitionCleanup = () => {
            movingTab._moveTogetherSelectedTabsData.animate = false;
          };
@@ -613,7 +619,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
            postTransitionCleanup();
          } else {
            let onTransitionEnd = transitionendEvent => {
-@@ -3062,7 +3138,7 @@
+@@ -3062,7 +3133,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -622,7 +628,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
          return;
        }
  
-@@ -3171,7 +3247,10 @@
+@@ -3171,7 +3242,10 @@
      #getDragTarget(event, { ignoreSides = false } = {}) {
        let { target } = event;
        while (target) {
@@ -634,7 +640,7 @@ index 1fcebe3962398ff1b7cadef657ac8b68a80e720d..f8e190aaae14b23bd1a50573f61114a0
            break;
          }
          target = target.parentNode;
-@@ -3188,6 +3267,9 @@
+@@ -3188,6 +3262,9 @@
            return null;
          }
        }