Revert "Bug 1977741 - Only update pinned tabs height when sidebar width changes r=nsharpley" for causing bc failures @browser_vertical_tabs.js.

agoloman · agoloman@mozilla.com · commit b817d24ad62e · 2026-04-11T00:25:07.000Z
This reverts commit 84a8d73.
diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
@@ -1511,10 +1511,7 @@ var SidebarController = {
     );
     this._panelResizeObserver.observe(this._box);
 
-    this._launcherDropHandler = () => {
-      this._state.launcherDragActive = false;
-      this.updatePinnedTabsHeightOnResize();
-    };
+    this._launcherDropHandler = () => (this._state.launcherDragActive = false);
     this._launcherSplitter.addEventListener(
       "command",
       this._launcherDropHandler
@@ -1538,19 +1535,15 @@ var SidebarController = {
       }
     });
 
-    this._itemsWrapperResizeObserver = new ResizeObserver(async ([entry]) => {
+    this._itemsWrapperResizeObserver = new ResizeObserver(async () => {
       await window.promiseDocumentFlushed(() => {
+        // Adjust pinned tabs container height if needed
         requestAnimationFrame(() => {
+          // If we are currently moving tabs, don't resize
           if (this._pinnedTabsContainer.hasAttribute("dragActive")) {
             return;
           }
-          // Only respond to WIDTH changes (sidebar being resized wider/narrower).
-          // Ignoring height changes prevents an infinite resize loop.
-          const newWidth = entry.contentBoxSize[0].inlineSize;
-          if (newWidth === this._pinnedTabsItemsWrapperWidth) {
-            return;
-          }
-          this._pinnedTabsItemsWrapperWidth = newWidth;
+
           this.updatePinnedTabsHeightOnResize();
         });
       });
@@ -1605,32 +1598,17 @@ var SidebarController = {
   },
 
   updatePinnedTabsHeightOnResize() {
-    // Skip during sidebar width drag to prevent unpinned tabs from jumping.
-    // The drop handler calls this function once cleanly after drag ends.
-    if (this.isLauncherDragging) {
-      return;
-    }
-
-    const preferredHeight = this._state.launcherExpanded
-      ? this._state.expandedPinnedTabsHeight
-      : this._state.collapsedPinnedTabsHeight;
-
-    if (!preferredHeight || !this._pinnedTabsContainer.childElementCount) {
-      return;
-    }
-
-    if (this.isLauncherDragging) {
-      // Clear height during drag so we can measure the natural content height accurately
-      this._pinnedTabsContainer.style.height = "";
-    }
-
     let itemsWrapperHeight = window.windowUtils.getBoundsWithoutFlushing(
       this._pinnedTabsItemsWrapper
     ).height;
-
-    // Clamp for display only — never overwrite the user's saved preference
-    const clampedHeight = Math.min(preferredHeight, itemsWrapperHeight);
-    this._pinnedTabsContainer.style.height = `${clampedHeight}px`;
+    if (this._state.pinnedTabsHeight > itemsWrapperHeight) {
+      this._state.pinnedTabsHeight = itemsWrapperHeight;
+      if (this._state.launcherExpanded) {
+        this._state.expandedPinnedTabsHeight = this._state.pinnedTabsHeight;
+      } else {
+        this._state.collapsedPinnedTabsHeight = this._state.pinnedTabsHeight;
+      }
+    }
   },
 
   /**
diff --git a/browser/components/sidebar/tests/browser/browser_resize_sidebar.js b/browser/components/sidebar/tests/browser/browser_resize_sidebar.js
@@ -233,11 +233,6 @@ add_task(async function test_resize_of_pinned_tabs() {
     "Pinned tabs container was resized."
   );
 
-  for (let tab of [...gBrowser.tabs]) {
-    if (tab.pinned) {
-      gBrowser.unpinTab(tab);
-    }
-  }
   while (gBrowser.tabs.length > 1) {
     BrowserTestUtils.removeTab(gBrowser.tabs.at(-1));
   }
diff --git a/browser/components/sidebar/tests/browser/browser_vertical_tabs.js b/browser/components/sidebar/tests/browser/browser_vertical_tabs.js
@@ -214,23 +214,26 @@ add_task(async function test_toggle_vertical_tabs() {
     true
   );
   let hidden2 = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
-  const tabToPin = gBrowser.selectedTab;
-  await openAndWaitForContextMenu(contextMenu, tabToPin, async () => {
-    info("Tab context menu opened");
-    let pinTabOption = document.getElementById("context_pinTab");
-    if (!pinTabOption) {
-      info("Pin tab context menu option not found");
+  await openAndWaitForContextMenu(
+    contextMenu,
+    gBrowser.selectedTab,
+    async () => {
+      info("Tab context menu opened");
+      let pinTabOption = document.getElementById("context_pinTab");
+      if (!pinTabOption) {
+        info("Pin tab context menu option not found");
+      }
+      pinTabOption?.click();
     }
-    pinTabOption?.click();
-  });
+  );
 
   await promiseTabPinned;
-  // Wait for the specific pinned tab to appear in the container
+  // Wait for pinned tab to render
   let pinnedTabsContainer = document.getElementById("pinned-tabs-container");
   await BrowserTestUtils.waitForMutationCondition(
     pinnedTabsContainer,
     { childList: true },
-    () => pinnedTabsContainer.contains(tabToPin)
+    () => pinnedTabsContainer.childElementCount === 1
   );
   info("Tab pinned via the context menu");
   contextMenu.hidePopup();
