From 8f1ee11ff26996e025037c759052f367229844bf Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Wed, 9 Apr 2025 00:16:33 +0200
Subject: [PATCH] Fix tab handling logic and update version details in
 surfer.json

---
 .../base/zen-components/ZenViewSplitter.mjs   | 28 +++++++++++++++----
 surfer.json                                   |  6 ++--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index 3c3330733..c7ded3c98 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -188,8 +188,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       this.fakeBrowser ||
       !this._lastOpenedTab ||
       (this._lastOpenedTab &&
-        (this._lastOpenedTab.getAttribute('zen-workspace-id') !== draggedTab.getAttribute('zen-workspace-id') ||
-          this._lastOpenedTab.hasAttribute('zen-essential')))
+        this._lastOpenedTab.getAttribute('zen-workspace-id') !== draggedTab.getAttribute('zen-workspace-id') &&
+        !this._lastOpenedTab.hasAttribute('zen-essential'))
     ) {
       return;
     }
@@ -887,7 +887,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       return false;
     }
     for (const tab of window.gBrowser.selectedTabs) {
-      if (tab.splitView || tab.hasAttribute('zen-empty-tab') || tab.hasAttribute('zen-essential')) {
+      if (tab.splitView || tab.hasAttribute('zen-empty-tab')) {
         return false;
       }
     }
@@ -945,14 +945,14 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
    */
   splitTabs(tabs, gridType, initialIndex = 0) {
     // TODO: Add support for splitting essential tabs
-    tabs = tabs.filter((t) => !t.hidden && !t.hasAttribute('zen-empty-tab') && !t.hasAttribute('zen-essential'));
+    tabs = tabs.filter((t) => !t.hidden && !t.hasAttribute('zen-empty-tab'));
     if (tabs.length < 2 || tabs.length > this.MAX_TABS) {
       return;
     }
-    this._moveTabsToContainer(tabs, tabs[initialIndex]);
 
     const existingSplitTab = tabs.find((tab) => tab.splitView);
     if (existingSplitTab) {
+      this._moveTabsToContainer(tabs, tabs[initialIndex]);
       const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab));
       const group = this._data[groupIndex];
       const gridTypeChange = gridType && group.gridType !== gridType;
@@ -978,6 +978,24 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       this.activateSplitView(group, true);
       return;
     }
+
+    // We are here if none of the tabs have been previously split
+    // If there's ANY pinned tab on the list, we clone the pinned tab
+    // state to all the tabs
+    const allArePinned = tabs.every((tab) => tab.pinned);
+    const allAreEssential = tabs.every((tab) => tab.hasAttribute('zen-essential'));
+    const thereIsOnePinned = tabs.some((tab) => tab.pinned);
+    const thereIsOneEssential = tabs.some((tab) => tab.hasAttribute('zen-essential'));
+
+    if ((thereIsOneEssential && !allAreEssential) || (thereIsOnePinned && !allArePinned)) {
+      for (let i = 0; i < tabs.length; i++) {
+        const tab = tabs[i];
+        if (tab.pinned) {
+          tabs[i] = gBrowser.duplicateTab(tab, true);
+        }
+      }
+    }
+
     gridType ??= 'grid';
 
     const splitData = {
diff --git a/surfer.json b/surfer.json
index c04e17bbd..20c6bf609 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
   "version": {
     "product": "firefox",
     "version": "137.0.1",
-    "candidate": "137.0"
+    "candidate": "137.0.1"
   },
   "buildOptions": {
     "generateBranding": true
@@ -19,7 +19,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.11.1b",
+        "displayVersion": "1.11.2b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -39,7 +39,7 @@
       "brandShortName": "Twilight",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.11.1t",
+        "displayVersion": "1.11.2t",
         "github": {
           "repo": "zen-browser/desktop"
         }