gh-14619: Fixed split view drag opening new windows (gh-14621)

When dragging a tab from the blank window to the main window, the blank
window doesn't close because '#isLastTabWindow' considers
'zen-empty-tab' as a normal tab.

README.md

@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `152.0.5`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0.5`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `152.0.6`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0.6`!
 
 ### Contributing
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-6bd10168f81fb90f878132d87cf681200afbcd91
+e7fbb446077536139cdd78b6a0386a97237af20f

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 08b5b56e069d038d72c87355920c4ce8a55ed805..e1a3a18081c7a8153f8d12c187bf4dd522944fcb 100644
+index 08b5b56e069d038d72c87355920c4ce8a55ed805..0e4f57c21d28ccf173d8d1e13e96c2c1f8a79f34 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -511,6 +511,7 @@
@@ -692,6 +692,15 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..e1a3a18081c7a8153f8d12c187bf4dd5
          return;
        }
  
+@@ -5776,7 +5973,7 @@
+      */
+     #isLastTabInWindow(tab) {
+       for (const otherTab of this.tabs) {
+-        if (otherTab != tab && otherTab.isOpen && !otherTab.hidden) {
++        if (otherTab != tab && otherTab.isOpen && !otherTab.hidden && !otherTab.hasAttribute("zen-empty-tab")) {
+           return false;
+         }
+       }
 @@ -5867,7 +6064,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab

src/zen/drag-and-drop/ZenDragAndDrop.js

@@ -661,6 +661,13 @@
       // can change the workspace after a short delay.
       const splitter = document.getElementById("zen-sidebar-splitter");
       let rect = window.windowUtils.getBoundsWithoutFlushing(gNavToolbox);
+      // If we are hovering over the essentials container, we can't change the workspace
+      const essentialsContainer = event.target.closest(
+        ".zen-essentials-container"
+      );
+      if (essentialsContainer) {
+        return { isNearLeftEdge: false, isNearRightEdge: false };
+      }
       if (!(
         gZenCompactModeManager.preference &&
         gZenCompactModeManager.canHideSidebar
@@ -715,20 +722,14 @@
 
     #handle_sidebarDragOver(event) {
       const dt = event.dataTransfer;
-      const draggedTab = dt.mozGetDataAt(TAB_DROP_TYPE, 0);
-      if (draggedTab.hasAttribute("zen-essential")) {
-        this.clearSpaceSwitchTimer();
-        return;
-      }
+
       const { isNearLeftEdge, isNearRightEdge } =
         this.#shouldSwitchSpace(event);
       if (isNearLeftEdge || isNearRightEdge) {
         if (!this.#changeSpaceTimer && !this.#isOutOfWindow) {
           this.#changeSpaceTimer = setTimeout(() => {
-            if (this.#isOutOfWindow) {
-              return;
-            }
             this.clearDragOverVisuals();
+            this.#maybeClearVerticalPinnedGridDragOver();
             gZenWorkspaces
               .changeWorkspaceShortcut(
                 isNearLeftEdge ? -1 : 1,
@@ -896,6 +897,13 @@
     }
 
     handle_windowDragLeave(event) {
+      // If relatedTarget exists, then we are still in the window
+      if (
+        event.relatedTarget ||
+        event.target.id === "zen-split-view-fake-browser"
+      ) {
+        return;
+      }
       const canvas = this._tabbrowserTabs._dndCanvas;
       if (!this.#isMovingTab() || !canvas) {
         return;
@@ -904,51 +912,38 @@
       if (!isTab(draggedTab)) {
         return;
       }
-      let { screenX, clientX, screenY, clientY } = event;
-      if (!screenX && !screenY) {
+      if (this.#isOutOfWindow) {
         return;
       }
-      const { innerWidth: winWidth, innerHeight: winHeight } = window;
-      let allowedMargin = Services.prefs.getIntPref(
-        "zen.tabs.dnd-outside-window-margin",
-        5
-      );
-      const isOutOfWindow =
-        clientX <= allowedMargin ||
-        clientX >= winWidth - allowedMargin ||
-        clientY <= allowedMargin ||
-        clientY >= winHeight - allowedMargin;
-      if (isOutOfWindow && !this.#isOutOfWindow) {
-        this.#isOutOfWindow = true;
-        gZenViewSplitter.onBrowserDragEndToSplit(event, true);
-        this.#maybeClearVerticalPinnedGridDragOver();
-        this.clearSpaceSwitchTimer();
-        this.clearDragOverVisuals();
-        const dt = event.dataTransfer;
-        let dragData = draggedTab._dragData;
-        let movingTabs = dragData.movingTabs;
-        if (!this._browserDragImageWrapper) {
-          const wrappingDiv = document.createXULElement("vbox");
-          canvas.style.borderRadius = "8px";
-          canvas.style.border = "2px solid white";
-          wrappingDiv.style.width = 200 + "px";
-          wrappingDiv.style.height = 130 + "px";
-          wrappingDiv.style.position = "relative";
-          this.#maybeCreateDragImageDot(movingTabs, wrappingDiv);
-          wrappingDiv.appendChild(canvas);
-          this._browserDragImageWrapper = wrappingDiv;
-          document.documentElement.appendChild(wrappingDiv);
-        }
-        dt.updateDragImage(
-          this._browserDragImageWrapper,
-          this.originalDragImageArgs[1],
-          this.originalDragImageArgs[2]
-        );
-        window.addEventListener("dragenter", this.handle_windowDragEnter, {
-          once: true,
-          capture: true,
-        });
+      this.#isOutOfWindow = true;
+      gZenViewSplitter.onBrowserDragEndToSplit(event, true);
+      this.#maybeClearVerticalPinnedGridDragOver();
+      this.clearDragOverVisuals();
+      this.clearSpaceSwitchTimer();
+      const dt = event.dataTransfer;
+      let dragData = draggedTab._dragData;
+      let movingTabs = dragData.movingTabs;
+      if (!this._browserDragImageWrapper) {
+        const wrappingDiv = document.createXULElement("vbox");
+        canvas.style.borderRadius = "8px";
+        canvas.style.border = "2px solid white";
+        wrappingDiv.style.width = 200 + "px";
+        wrappingDiv.style.height = 130 + "px";
+        wrappingDiv.style.position = "relative";
+        this.#maybeCreateDragImageDot(movingTabs, wrappingDiv);
+        wrappingDiv.appendChild(canvas);
+        this._browserDragImageWrapper = wrappingDiv;
+        document.documentElement.appendChild(wrappingDiv);
       }
+      dt.updateDragImage(
+        this._browserDragImageWrapper,
+        this.originalDragImageArgs[1],
+        this.originalDragImageArgs[2]
+      );
+      window.addEventListener("dragenter", this.handle_windowDragEnter, {
+        once: true,
+        capture: true,
+      });
     }
 
     handle_drop(event) {
@@ -1333,7 +1328,8 @@
       // Essentials should be properly handled by ::animateVerticalPinnedGridDragOver
       if (!dropElement || dropElement.hasAttribute("zen-essential")) {
         this.clearDragOverVisuals();
-        return null;
+        // If dropElement is null or essential, dropElement should be the empty tab
+        return [dropBefore, gZenWorkspaces._emptyTab];
       }
       if (dropElement.hasAttribute("zen-empty-tab") && dropElement.group) {
         let secondTab = dropElement.group.tabs[1];
@@ -1477,10 +1473,7 @@
       let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
       let dragData = draggedTab._dragData;
       let movingTabs = dragData.movingTabs;
-      if (
-        !gZenPinnedTabManager.canEssentialBeAdded(draggedTab) &&
-        !draggedTab.hasAttribute("zen-essential")
-      ) {
+      if (!gZenPinnedTabManager.canEssentialBeAdded(draggedTab)) {
         return;
       }
       let essentialsPromoStatus = this.createZenEssentialsPromo();

src/zen/spaces/ZenSpaceManager.mjs

@@ -460,16 +460,19 @@ class nsZenWorkspaces {
       document
         .getElementById("zen-essentials")
         .appendChild(essentialsContainer);
-
-      // Set an initial hidden state if the essentials section is not supposed
-      // to be shown on the current workspace
-      if (
-        this.containerSpecificEssentials &&
-        this.getActiveWorkspaceFromCache()?.containerTabId != container
-      ) {
-        essentialsContainer.setAttribute("hidden", "true");
-      }
     }
+
+    // Set a hidden state if the essentials section is not supposed
+    // to be shown on the current workspace, else remove the hidden state
+    if (
+      this.containerSpecificEssentials &&
+      this.getActiveWorkspaceFromCache()?.containerTabId != container
+    ) {
+      essentialsContainer.setAttribute("hidden", "true");
+    } else {
+      essentialsContainer.removeAttribute("hidden");
+    }
+
     return essentialsContainer;
   }
 
@@ -1161,6 +1164,9 @@ class nsZenWorkspaces {
     const item = document.createXULElement("menuitem");
     item.className = "zen-workspace-context-menu-item";
     item.setAttribute("zen-workspace-id", workspace.uuid);
+    if (AppConstants.platform === "linux") {
+      disableCurrent = true;
+    }
     if (!disableCurrent) {
       item.setAttribute("type", "radio");
     }
@@ -1583,6 +1589,11 @@ class nsZenWorkspaces {
   }
 
   moveTabsToWorkspace(tabs, workspaceID) {
+    const newTabPlacement = Services.prefs.getBoolPref(
+      "zen.view.show-newtab-button-top",
+      false
+    );
+    tabs = newTabPlacement ? tabs.reverse() : tabs;
     for (let tab of tabs) {
       const workspaceContainer = this.workspaceElement(workspaceID);
       const container = tab.pinned
@@ -1597,14 +1608,11 @@ class nsZenWorkspaces {
       }
 
       if (container) {
-        const newtabPlacement = Services.prefs.getBoolPref(
-          "zen.view.show-newtab-button-top",
-          false
-        );
-        const insertElement = newtabPlacement
+        const insertElement = newTabPlacement
           ? container.firstChild
           : container.lastChild;
 
+        const previousWorkspaceID = tab.getAttribute("zen-workspace-id");
         if (tab.group?.hasAttribute("split-view-group")) {
           gBrowser.zenHandleTabMove(tab.group, () => {
             for (const subTab of tab.group.tabs) {
@@ -1618,6 +1626,12 @@ class nsZenWorkspaces {
           tab.setAttribute("zen-workspace-id", workspaceID);
           container.insertBefore(tab, insertElement);
         });
+
+        if (this.lastSelectedWorkspaceTabs[previousWorkspaceID] === tab) {
+          // This tab is no longer the last selected tab in the previous workspace because it's being moved to
+          // the current workspace
+          delete this.lastSelectedWorkspaceTabs[previousWorkspaceID];
+        }
       }
       // also change glance tab if it's the same tab
       const glanceTab = tab.querySelector(".tabbrowser-tab[zen-glance-tab]");
@@ -1690,6 +1704,7 @@ class nsZenWorkspaces {
     try {
       this.log("Changing workspace to", workspace?.uuid);
       await this.#performWorkspaceChange(workspace, ...args);
+      this.updateWorkspacesChangeContextMenu();
     } catch (e) {
       console.error("gZenWorkspaces: Error changing workspace", e);
     }
@@ -1864,11 +1879,6 @@ class nsZenWorkspaces {
       }
       const newTransform = diff * 100;
       element.style.transform = `translateX(${newTransform + offsetPixels / 2}%)`;
-      // A special case for two spaces
-      if (spaceLen === 2 && diff !== 0) {
-        const side = offsetPixels > 0 ? -100 : 100;
-        element.style.transform = `translateX(${side + offsetPixels / 2}%)`;
-      }
     }
     // Hide other essentials with different containerTabId
     for (const container of otherContainersEssentials) {
@@ -2099,12 +2109,6 @@ class nsZenWorkspaces {
         offset += spaceLen;
       }
       offset = offset * 100;
-      // A special case for two spaces
-      if (spaceLen === 2 && offset !== 0) {
-        const currentTransform =
-          parseFloat(element.style.transform.split("(")[1]) || 0;
-        offset = currentTransform >= 0 ? 100 : -100;
-      }
       const newTransform = `translateX(${offset}%)`;
       // Only animate the workspace that is coming in, to avoid having multiple workspaces
       // animating off-screen at the same time which can cause performance issues. With an off
@@ -2181,17 +2185,6 @@ class nsZenWorkspaces {
           existingOffset = currentTransform || (isGoingLeft ? -100 : 100);
           newOffset = 0;
         }
-
-        if (spaceLen === 2) {
-          if (containsPrev && !containsNew) {
-            existingOffset = currentTransform;
-            newOffset = currentTransform >= 0 ? 100 : -100;
-          } else {
-            existingOffset = currentTransform >= 0 ? 100 : -100;
-            newOffset = 0;
-          }
-        }
-
         const newTransform = `translateX(${newOffset}%)`;
         let existingTransform = `translateX(${existingOffset}%)`;
         if (shouldAnimate) {
@@ -2489,9 +2482,12 @@ class nsZenWorkspaces {
     if (gZenWorkspaces.privateWindowOrDisabled) {
       return;
     }
-    const workspaces = this.getWorkspaces();
+    const workspaces = this.getWorkspaces().filter(
+      w => w.uuid !== this.activeWorkspace
+    );
     const ctxCommand = document.getElementById("cmd_zenCtxDeleteWorkspace");
-    if (workspaces.length <= 1) {
+    const hasMultipleWorkspaces = !!workspaces.length;
+    if (!hasMultipleWorkspaces) {
       ctxCommand.setAttribute("disabled", "true");
     } else {
       ctxCommand.removeAttribute("disabled");
@@ -2511,6 +2507,9 @@ class nsZenWorkspaces {
       )) {
         item.remove();
       }
+      if (!hasMultipleWorkspaces) {
+        continue;
+      }
       const separator = document.createXULElement("menuseparator");
       separator.classList.add("zen-workspace-context-menu-item");
       if (isMoveTabPopup) {
@@ -2952,15 +2951,7 @@ class nsZenWorkspaces {
       ? gBrowser.selectedTabs
       : [TabContextMenu.contextTab];
     document.getElementById("tabContextMenu").hidePopup();
-    for (let tab of tabs) {
-      const previousWorkspaceID = tab.getAttribute("zen-workspace-id");
-      this.moveTabToWorkspace(tab, workspaceID);
-      if (this.lastSelectedWorkspaceTabs[previousWorkspaceID] === tab) {
-        // This tab is no longer the last selected tab in the previous workspace because it's being moved to
-        // the current workspace
-        delete this.lastSelectedWorkspaceTabs[previousWorkspaceID];
-      }
-    }
+    this.moveTabsToWorkspace(tabs, workspaceID);
     // Make sure we select the last tab in the new workspace
     this.lastSelectedWorkspaceTabs[workspaceID] =
       gZenGlanceManager.getTabOrGlanceParent(tabs[tabs.length - 1]);

src/zen/sync/ZenWorkspacesSync.sys.mjs

@@ -33,10 +33,10 @@ const RECORD_TYPE_BY_PREFIX = Object.freeze({
  * Workspaces engine collection.
  */
 export class ZenWorkspacesRecord extends CryptoWrapper {
-  _logName = "Sync.Record.ZenWorkspaces";
+  _logName = "Sync.Record.ZenSpaces";
 }
 
-ZenWorkspacesRecord.prototype.type = "workspaces";
+ZenWorkspacesRecord.prototype.type = "spaces";
 
 function parseRecordId(id) {
   const sep = id.indexOf("~");
@@ -51,7 +51,7 @@ function parseRecordId(id) {
 function createRecordId(type, id) {
   const prefix = RECORD_ID_PREFIX_BY_TYPE[type];
   if (!prefix) {
-    throw new Error(`Unknown Workspaces Sync record type: ${type}`);
+    throw new Error(`Unknown Spaces Sync record type: ${type}`);
   }
   return `${prefix}~${id}`;
 }
@@ -371,11 +371,11 @@ class ZenWorkspacesTracker extends Tracker {
  */
 export class ZenWorkspacesEngine extends SyncEngine {
   static get name() {
-    return "Workspaces";
+    return "Spaces";
   }
 
   constructor(service) {
-    super("Workspaces", service);
+    super("Spaces", service);
   }
 
   get _storeObj() {

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -835,6 +835,16 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
         let isRegularTabs = false;
         // Check for essentials container
         if (essentialTabsTarget) {
+          if (gZenWorkspaces.containerSpecificEssentials) {
+            const targetContainerId =
+              gZenWorkspaces.getActiveWorkspaceFromCache().containerTabId;
+            const sameContextId =
+              (tab.getAttribute("usercontextid") || 0) == targetContainerId;
+            if (!sameContextId && tab.hasAttribute("zen-essential")) {
+              this.removeEssentials(tab, false);
+              moved = true;
+            }
+          }
           if (
             !tab.hasAttribute("zen-essential") &&
             !tab?.group?.hasAttribute("split-view-group")

surfer.json

@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "152.0.5",
-    "candidate": "152.0.5",
+    "version": "152.0.6",
+    "candidate": "152.0.6",
     "candidateBuild": 1
   },
   "buildOptions": {
@@ -20,7 +20,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.21.6b",
+        "displayVersion": "1.21.8b",
         "github": {
           "repo": "zen-browser/desktop"
         },