Implement tab pinning functionality and default workspace creation logic

src/browser/base/zen-components/ZenWelcome.mjs

@@ -1,4 +1,7 @@
 {
+  var _tabsToPin = [];
+  var _tabsToPinEssentials = [];
+
   function clearBrowserElements() {
     for (const element of document.getElementById('browser').children) {
       element.style.display = 'none';
@@ -45,13 +48,7 @@
       const tab = window.gBrowser.addTrustedTab(url, {
         inBackground: true,
       });
-      setTimeout(
+      _tabsToPin.push(tab);
-        (tab) => {
-          gBrowser.pinTab(tab);
-        },
-        1000,
-        tab
-      );
     }
   }
 
@@ -177,10 +174,7 @@
     async next() {
       if (this._currentPage !== -1) {
         const previousPage = this._pages[this._currentPage];
-        const promises = [
+        const promises = [this.fadeOutTitles(), this.fadeOutButtons()];
-          this.fadeOutTitles(),
-          this.fadeOutButtons(),
-        ];
         if (!previousPage.dontFadeOut) {
           promises.push(this.fadeOutContent());
         }
@@ -204,6 +198,7 @@
       await animate('#zen-welcome-page-content', { x: [0, '100%'] }, { bounce: 0 });
       document.getElementById('zen-welcome-page-content').remove();
       await this.animHeart();
+      this._pinRemainingTabs();
       await animate('#zen-welcome-pages', { opacity: [1, 0] });
       document.getElementById('zen-welcome').remove();
       document.documentElement.removeAttribute('zen-welcome-stage');
@@ -216,6 +211,15 @@
       gZenUIManager.showToast('zen-welcome-finished');
     }
 
+    _pinRemainingTabs() {
+      for (const tab of _tabsToPin) {
+        gBrowser.pinTab(tab);
+      }
+      for (const tab of _tabsToPinEssentials) {
+        gZenPinnedTabManager.addToEssentials(tab);
+      }
+    }
+
     async animHeart() {
       const heart = document.createElement('div');
       heart.id = 'zen-welcome-heart';
@@ -438,13 +442,7 @@
             const createdTab = window.gBrowser.addTrustedTab(url, {
               inBackground: true,
             });
-            setTimeout(
+            _tabsToPinEssentials.push(createdTab);
-              (tab) => {
-                gZenPinnedTabManager.addToEssentials(tab);
-              },
-              1000,
-              createdTab
-            );
           }
           openInitialPinTab();
           openWelcomeTab();

src/browser/base/zen-components/ZenWorkspaces.mjs

@@ -124,11 +124,20 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     this._pinnedTabsResizeObserver = new ResizeObserver(this.onPinnedTabsResize.bind(this));
     await this.waitForPromises();
+    await this._createDefaultWorkspaceIfNeeded();
     await this.initializeTabsStripSections();
     this._resolveSectionsInitialized();
     this._initializeEmptyTab();
   }
 
+  async _createDefaultWorkspaceIfNeeded() {
+    const workspaces = await this._workspaces();
+    if (!workspaces.workspaces.length) {
+      await this.createAndSaveWorkspace('Default Workspace', true, '🏠', true);
+      this._workspaceCache = null;
+    }
+  }
+
   _initializeEmptyTab() {
     gBrowser._forZenEmptyTab = true;
     this._emptyTab = gBrowser.addTrustedTab('about:blank', { inBackground: true });
@@ -570,14 +579,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
       window.addEventListener('TabOpen', this.updateTabsContainers.bind(this));
       window.addEventListener('TabClose', this.updateTabsContainers.bind(this));
-      let workspaces = await this._workspaces();
+      let activeWorkspace = await this.getActiveWorkspace();
-      let activeWorkspace = null;
+      this.activeWorkspace = activeWorkspace?.uuid;
-      if (workspaces.workspaces.length === 0) {
-        activeWorkspace = await this.createAndSaveWorkspace('Default Workspace', true, '🏠');
-      } else {
-        activeWorkspace = await this.getActiveWorkspace();
-        this.activeWorkspace = activeWorkspace?.uuid;
-      }
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
@@ -599,7 +602,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       return;
     }
     const currentTabUrl = currentTab.linkedBrowser?.currentURI.spec;
-    console.log('ZenWorkspaces: Current tab URL', currentTabUrl);
     if (currentTabUrl === 'about:blank' || currentTabUrl === 'about:newtab' || currentTabUrl === 'about:home') {
       this.selectEmptyTab();
       gBrowser.removeTab(currentTab);
@@ -785,10 +787,12 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     });
   }
 
-  async saveWorkspace(workspaceData) {
+  async saveWorkspace(workspaceData, preventPropagation = false) {
     await ZenWorkspacesStorage.saveWorkspace(workspaceData);
-    await this._propagateWorkspaceData();
+    if (!preventPropagation) {
-    await this._updateWorkspacesChangeContextMenu();
+      await this._propagateWorkspaceData();
+      await this._updateWorkspacesChangeContextMenu();
+    }
   }
 
   async removeWorkspace(windowID) {
@@ -1799,7 +1803,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-  _createWorkspaceData(name, isDefault, icon, tabs) {
+  _createWorkspaceData(name, isDefault, icon, tabs, moveTabs = true) {
     let window = {
       uuid: gZenUIManager.generateUuidv4(),
       default: isDefault,
@@ -1807,15 +1811,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       name: name,
       theme: ZenThemePicker.getTheme([]),
     };
-    this._prepareNewWorkspace(window);
+    if (moveTabs) {
-    const perifery = document.querySelector('#tabbrowser-arrowscrollbox-periphery[hidden]');
+      this._prepareNewWorkspace(window);
-    perifery?.removeAttribute('hidden');
+      const perifery = document.querySelector('#tabbrowser-arrowscrollbox-periphery[hidden]');
-    this._createWorkspaceTabsSection(window, tabs, perifery);
+      perifery?.removeAttribute('hidden');
-    perifery.setAttribute('hidden', 'true');
+      this._createWorkspaceTabsSection(window, tabs, perifery);
+      perifery.setAttribute('hidden', 'true');
+    }
     return window;
   }
 
-  async createAndSaveWorkspace(name = 'New Workspace', isDefault = false, icon = undefined) {
+  async createAndSaveWorkspace(name = 'New Workspace', isDefault = false, icon = undefined, dontChange = false) {
     if (!this.workspaceEnabled) {
       return;
     }
@@ -1823,15 +1829,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const extraTabs = Array.from(gBrowser.tabContainer.arrowScrollbox.children).filter(
       (child) => child.tagName === 'tab' && !child.hasAttribute('zen-workspace-id')
     );
-    let workspaceData = this._createWorkspaceData(name, isDefault, icon, extraTabs);
+    let workspaceData = this._createWorkspaceData(name, isDefault, icon, extraTabs, !dontChange);
-    await this.saveWorkspace(workspaceData);
+    await this.saveWorkspace(workspaceData, dontChange);
-    this.registerPinnedResizeObserver();
+    if (!dontChange) {
-    let changed = extraTabs.length > 0;
+      this.registerPinnedResizeObserver();
-    if (changed) {
+      let changed = extraTabs.length > 0;
-      gBrowser.tabContainer._invalidateCachedTabs();
+      if (changed) {
-      gBrowser.selectedTab = extraTabs[0];
+        gBrowser.tabContainer._invalidateCachedTabs();
+        gBrowser.selectedTab = extraTabs[0];
+      }
+      await this.changeWorkspace(workspaceData);
     }
-    await this.changeWorkspace(workspaceData);
     return workspaceData;
   }