feat: Zen Folders

src/browser/base/content/zen-panels/popups.inc

@@ -30,3 +30,13 @@
   <menuitem data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenOpenWorkspaceCreation"/>
   <menuitem id="context_zenDeleteWorkspace" data-l10n-id="zen-workspaces-panel-context-delete" command="cmd_zenCtxDeleteWorkspace"/>
 </menupopup>
+
+<panel id="zen-folder-tabs-popup" type="arrow" orient="vertical">
+  <hbox class="tabs-list-header">
+    <html:input id="zen-folder-tabs-list-search" placeholder="Search tabs" type="search"/>
+    <image class="zen-folder-tabs-list-search-icon" src="chrome://global/skin/icons/search-glass.svg"/>
+  </hbox>
+  <scrollbox class="zen-folder-tabs-list-scrollbox" flex="1">
+    <vbox id="zen-folder-tabs-list"></vbox>
+  </scrollbox>
+</panel>

src/browser/components/sessionstore/SessionStore-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e586e4fbd 100644
+index be029379c1..704db605e9 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -2120,7 +2120,6 @@ var SessionStoreInternal = {
@@ -13,13 +13,13 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
 @@ -2353,11 +2352,9 @@ var SessionStoreInternal = {
            tabbrowser.selectedTab.label;
        }
- 
+
 -      if (AppConstants.platform != "macosx") {
          // Until we decide otherwise elsewhere, this window is part of a series
          // of closing windows to quit.
          winData._shouldRestore = true;
 -      }
- 
+
        // Store the window's close date to figure out when each individual tab
        // was closed. This timestamp should allow re-arranging data based on how
 @@ -3303,7 +3300,7 @@ var SessionStoreInternal = {
@@ -30,7 +30,7 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
 +    if (aTab == aWindow.FirefoxViewHandler.tab || aTab.hasAttribute("zen-empty-tab")) {
        return;
      }
- 
+
 @@ -4012,6 +4009,11 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
@@ -40,7 +40,7 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
 +      tabState.zenIsGlance = false;
 +      tabState.zenGlanceId = null;
 +      tabState.zenHasStaticLabel = false;
- 
+
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
 @@ -4448,6 +4450,7 @@ var SessionStoreInternal = {
@@ -52,7 +52,7 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
        skipLoad: true,
        preferredRemoteType,
 @@ -5303,7 +5306,7 @@ var SessionStoreInternal = {
- 
+
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
 -      if (homePages.includes(tab.linkedBrowser.currentURI.spec)) {
@@ -62,7 +62,7 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
      }
 @@ -5363,7 +5366,7 @@ var SessionStoreInternal = {
      }
- 
+
      let workspaceID = aWindow.getWorkspaceID();
 -    if (workspaceID) {
 +    if (workspaceID && !(this.isLastRestorableWindow() && AppConstants.platform == "macosx")) {
@@ -71,14 +71,14 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
    },
 @@ -5554,14 +5557,15 @@ var SessionStoreInternal = {
      }
- 
+
      let tabbrowser = aWindow.gBrowser;
 -    let tabs = tabbrowser.tabs;
 +    let tabs = aWindow.gZenWorkspaces.allStoredTabs;
      /** @type {WindowStateData} */
      let winData = this._windows[aWindow.__SSi];
      let tabsData = (winData.tabs = []);
- 
+
 +    winData.splitViewData = aWindow.gZenViewSplitter?.storeDataForSessionStore();
      // update the internal state data for this window
      for (let tab of tabs) {
@@ -87,7 +87,15 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
          continue;
        }
        let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
-@@ -5580,8 +5584,8 @@ var SessionStoreInternal = {
+@@ -5569,6 +5573,7 @@ var SessionStoreInternal = {
+       tabsData.push(tabData);
+     }
+
++    winData.folders = aWindow.gZenFolders?.storeDataForSessionStore() || [];
+     // update tab group state for this window
+     winData.groups = [];
+     for (let tabGroup of aWindow.gBrowser.tabGroups) {
+@@ -5580,8 +5585,8 @@ var SessionStoreInternal = {
      // We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
@@ -98,7 +106,7 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5693,8 +5697,8 @@ var SessionStoreInternal = {
+@@ -5693,8 +5698,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -108,17 +116,18 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
 +      selectTab = Math.max(selectTab, 0);
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
- 
-@@ -5737,6 +5741,7 @@ var SessionStoreInternal = {
+
+@@ -5737,6 +5742,8 @@ var SessionStoreInternal = {
          winData.tabs,
          winData.groups ?? []
        );
 +      aWindow.gZenViewSplitter?.restoreDataFromSessionStore(winData.splitViewData);
++      aWindow.gZenFolders?.restoreDataFromSessionStore(winData.folders);
        this._log.debug(
          `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
        );
-@@ -6286,6 +6291,22 @@ var SessionStoreInternal = {
- 
+@@ -6286,6 +6293,22 @@ var SessionStoreInternal = {
+
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
 +    if (tabData.zenEssential) {
@@ -137,6 +146,6 @@ index be029379c101a0105d4837136e064e6007b67c3e..f998ad44015b05104e8a1dbeebd7b94e
 +    if (tabData.zenDefaultUserContextId) {
 +      tab.setAttribute("zenDefaultUserContextId", true);
 +    }
- 
+
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);

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

@@ -35,31 +35,42 @@ index 793ba822f087f4d198c9876ed208ff16d8a41e3b..f0c4bc58d7d48491e0c0ab9eb3e915b1
          ".tab-label":
 @@ -180,7 +183,7 @@
      }
- 
+
      set _visuallySelected(val) {
 -      if (val == this.hasAttribute("visuallyselected")) {
 +      if (val == this.hasAttribute("visuallyselected") || (!val && this.linkedBrowser?.closest('.browserSidebarContainer').classList.contains('zen-glance-background'))) {
          return;
        }
- 
+
 @@ -216,7 +219,7 @@
      }
- 
+
      get visible() {
 -      return this.isOpen && !this.hidden && !this.group?.collapsed;
 +      return this.isOpen && !this.hidden && !this.group?.collapsed && !this.hasAttribute("zen-empty-tab");
      }
- 
+
      get hidden() {
 @@ -287,7 +290,7 @@
          return false;
        }
- 
+
 -      return true;
 +      return !this.hasAttribute("zen-empty-tab");
      }
- 
+
      get lastAccessed() {
+@@ -364,8 +367,8 @@
+     }
+
+     get group() {
+-      if (this.parentElement?.tagName == "tab-group") {
+-        return this.parentElement;
++      if (gBrowser.isTabGroup(this.parentElement?.parentElement)) {
++        return this.parentElement.parentElement;
+       }
+       return null;
+     }
 @@ -459,6 +462,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (
@@ -72,7 +83,7 @@ index 793ba822f087f4d198c9876ed208ff16d8a41e3b..f0c4bc58d7d48491e0c0ab9eb3e915b1
 @@ -513,6 +518,10 @@
        this.style.MozUserFocus = "";
      }
- 
+
 +    get glanceTab() {
 +      return this.querySelector("tab[zen-glance-tab]");
 +    }
@@ -101,7 +112,7 @@ index 793ba822f087f4d198c9876ed208ff16d8a41e3b..f0c4bc58d7d48491e0c0ab9eb3e915b1
 +        gBrowser.tabContainer._blockDblClick = true;
 +      }
      }
- 
+
      on_dblclick(event) {
 @@ -596,6 +614,8 @@
            animate: true,
@@ -111,4 +122,4 @@ index 793ba822f087f4d198c9876ed208ff16d8a41e3b..f0c4bc58d7d48491e0c0ab9eb3e915b1
 +        gZenPinnedTabManager._onTabResetPinButton(event, this, 'reset');
        }
      }
- 
+