Merge branch 'dev' into dev

Author: gordonn

.github/workflows/issue-metrics.yml

@@ -42,7 +42,7 @@ jobs:
           echo "last_month_year=$previous_year" >> "$GITHUB_ENV"
 
       - name: Run issue-metrics tool
-        uses: github/issue-metrics@v2
+        uses: github-community-projects/issue-metrics@v2
         env:
           GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
           HIDE_AUTHOR: true

prefs/firefox/browser.yaml

@@ -86,3 +86,7 @@
 - name: browser.tabs.splitView.enabled
   value: false
   locked: true
+
+# See gh-12985 for details on the following preferences
+- name: browser.search.widget.new
+  value: true

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e0474669fc15c20 100644
+index e4266a159a0d5c42cc294602d00b8f66131f35d5..f3e362f062063ebe08bd26cc694f2d965ccffd84 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -21,6 +21,7 @@
@@ -52,7 +52,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
          return;
        }
 
-@@ -225,11 +228,23 @@
+@@ -225,11 +228,25 @@
      }
 
      get visible() {
@@ -74,14 +74,16 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
 +        }
 +        currentParent = currentParent.group;
 +      }
-+      if (this.pinned && !this.hasAttribute("zen-essential") && gZenWorkspaces.activeWorkspaceElement?.hasCollapsedPinnedTabs) {
++      if (this.pinned && !this.hasAttribute("zen-essential") &&
++          gZenWorkspaces.activeWorkspaceElement?.hasCollapsedPinnedTabs &&
++          !gZenWorkspaces.activeWorkspaceElement.collapsiblePins.activeTabs?.includes(this)) {
 +        return false;
 +      }
 +      return true;
      }
 
      get hidden() {
-@@ -308,7 +323,7 @@
+@@ -308,7 +325,7 @@
          return false;
        }
 
@@ -90,7 +92,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
      }
 
      get lastAccessed() {
-@@ -393,7 +408,18 @@
+@@ -393,7 +410,18 @@
      }
 
      get group() {
@@ -110,7 +112,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
      }
 
      get splitview() {
-@@ -475,6 +501,10 @@
+@@ -475,6 +503,10 @@
          }
        }
 
@@ -121,15 +123,15 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
        // If the previous target wasn't part of this tab then this is a mouseenter event.
        if (!this.contains(event.relatedTarget)) {
          this._mouseenter();
-@@ -504,6 +534,7 @@
+@@ -504,6 +536,7 @@
        if (!this.contains(event.relatedTarget)) {
          this._mouseleave();
        }
 +      gZenPinnedTabManager.onResetPinButtonMouseOut(this);
      }
 
      on_dragstart(event) {
-@@ -538,6 +569,8 @@
+@@ -538,6 +571,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (
          event.target.classList.contains("tab-close-button") ||
@@ -138,7 +140,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
          event.target.classList.contains("tab-icon-overlay") ||
          event.target.classList.contains("tab-audio-button")
        ) {
-@@ -592,16 +625,21 @@
+@@ -592,16 +627,21 @@
        this.style.MozUserFocus = "";
      }
 
@@ -161,7 +163,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
          gBrowser.multiSelectedTabsCount > 0 &&
          !event.target.classList.contains("tab-close-button") &&
          !event.target.classList.contains("tab-icon-overlay") &&
-@@ -613,8 +651,9 @@
+@@ -613,8 +653,9 @@
        }
 
        if (
@@ -173,7 +175,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
        ) {
          if (this.activeMediaBlocked) {
            if (this.multiselected) {
-@@ -632,7 +671,7 @@
+@@ -632,7 +673,7 @@
          return;
        }
 
@@ -182,7 +184,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
          if (this.multiselected) {
            gBrowser.removeMultiSelectedTabs(
              lazy.TabMetrics.userTriggeredContext(
-@@ -652,6 +691,14 @@
+@@ -652,6 +693,14 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
@@ -197,7 +199,7 @@ index e4266a159a0d5c42cc294602d00b8f66131f35d5..88c321f05dabd948d06e155f6e047466
      }
 
      on_dblclick(event) {
-@@ -675,6 +722,8 @@
+@@ -675,6 +724,8 @@
            animate: true,
            triggeringEvent: event,
          });

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabgroup.js b/browser/components/tabbrowser/content/tabgroup.js
-index 3ca119e8dc72fac652c98505211864483d98add2..026b524be51170882e788a701095b938d6923f3e 100644
+index 3ca119e8dc72fac652c98505211864483d98add2..b65307ee8df896488a4c51e3a25bf9ad9e1c8179 100644
 --- a/browser/components/tabbrowser/content/tabgroup.js
 +++ b/browser/components/tabbrowser/content/tabgroup.js
 @@ -14,11 +14,11 @@
@@ -101,7 +101,13 @@ index 3ca119e8dc72fac652c98505211864483d98add2..026b524be51170882e788a701095b938
 
      resetDefaultGroupName = () => {
        this.#defaultGroupName = "";
-@@ -178,7 +201,9 @@
+@@ -175,10 +198,15 @@
+       if (!this.#tabChangeObserver) {
+         this.#tabChangeObserver = new window.MutationObserver(mutations => {
+           if (!this.tabs.length) {
++            if (this.tagName === "zen-workspace-collapsible-pins") {
++              return;
++            }
              this.dispatchEvent(
                new CustomEvent("TabGroupRemoved", { bubbles: true })
              );
@@ -111,7 +117,7 @@ index 3ca119e8dc72fac652c98505211864483d98add2..026b524be51170882e788a701095b938
              Services.obs.notifyObservers(
                this,
                "browser-tabgroup-removed-from-dom"
-@@ -223,7 +248,10 @@
+@@ -223,7 +251,10 @@
            }
          });
        }
@@ -123,7 +129,7 @@ index 3ca119e8dc72fac652c98505211864483d98add2..026b524be51170882e788a701095b938
      }
 
      get color() {
-@@ -317,6 +345,9 @@
+@@ -317,6 +348,9 @@
      }
 
      set collapsed(val) {
@@ -133,15 +139,15 @@ index 3ca119e8dc72fac652c98505211864483d98add2..026b524be51170882e788a701095b938
        if (!!val == this.collapsed) {
          return;
        }
-@@ -403,7 +434,6 @@
+@@ -403,7 +437,6 @@
            tabGroupName,
          })
          .then(result => {
 -          this.dataset.tooltip = result;
          });
      }
 
-@@ -478,13 +508,65 @@
+@@ -478,13 +511,65 @@
       * @returns {MozTabbrowserTab[]}
       */
      get tabs() {
@@ -212,15 +218,15 @@ index 3ca119e8dc72fac652c98505211864483d98add2..026b524be51170882e788a701095b938
      }
 
      /**
-@@ -592,7 +674,6 @@
+@@ -592,7 +677,6 @@
            );
          } else {
            if (tabOrSplitView.pinned) {
 -            tabOrSplitView.ownerGlobal.gBrowser.unpinTab(tabOrSplitView);
            }
            let tabToMove =
              this.ownerGlobal === tabOrSplitView.ownerGlobal
-@@ -661,7 +742,7 @@
+@@ -661,7 +745,7 @@
       */
      on_click(event) {
        let isToggleElement =
@@ -229,7 +235,7 @@ index 3ca119e8dc72fac652c98505211864483d98add2..026b524be51170882e788a701095b938
          event.target === this.#overflowCountLabel;
        if (isToggleElement && event.button === 0) {
          event.preventDefault();
-@@ -740,5 +821,6 @@
+@@ -740,5 +824,6 @@
      }
    }