fix: Small fixes to folders, b=no-bug, c=tabs, common, folders

src/zen/common/ZenUIManager.mjs

@@ -1056,6 +1056,7 @@ var gZenVerticalTabsManager = {
       this._tabEdited = null;
       return;
     }
+    gZenFolders.cancelPopupTimer();
     event.stopPropagation?.();
     document.documentElement.setAttribute('zen-renaming-tab', 'true');
     const label = isTab ? this._tabEdited.querySelector('.tab-label-container') : this._tabEdited;

src/zen/folders/ZenFolders.mjs

@@ -170,7 +170,7 @@
         .getElementById('zen-context-menu-new-folder')
         .addEventListener('command', this.#onNewFolder.bind(this));
       SessionStore.promiseInitialized.then(() => {
-        gBrowser.tabContainer.addEventListener('dragstart', this.#cancelPopupTimer.bind(this));
+        gBrowser.tabContainer.addEventListener('dragstart', this.cancelPopupTimer.bind(this));
       });
     }
 
@@ -204,6 +204,9 @@
       const isActive = group?.activeGroups?.length > 0;
       if (isActive) tab.setAttribute('folder-active', true);
       if (prevTab.hasAttribute('folder-active')) prevTab.removeAttribute('folder-active');
+      if (tab.group?.collapsed) {
+        this.expandToSelected(group);
+      }
       gBrowser.tabContainer._invalidateCachedTabs();
     }
 
@@ -257,7 +260,7 @@
       }
     }
 
-    #cancelPopupTimer() {
+    cancelPopupTimer() {
       if (this.#mouseTimer) {
         clearTimeout(this.#mouseTimer);
         this.#mouseTimer = null;
@@ -269,7 +272,7 @@
       const group = event.target;
       if (!group.isZenFolder) return;
 
-      this.#cancelPopupTimer();
+      this.cancelPopupTimer();
 
       const tabsContainer = group.querySelector('.tab-group-container');
       const animations = [];
@@ -348,7 +351,7 @@
       const group = event.target;
       if (!group.isZenFolder) return;
 
-      this.#cancelPopupTimer();
+      this.cancelPopupTimer();
 
       const tabsContainer = group.querySelector('.tab-group-container');
       tabsContainer.removeAttribute('hidden');
@@ -632,6 +635,9 @@
 
     openTabsPopup(event) {
       event.stopPropagation();
+      if (document.documentElement.getAttribute('zen-renaming-tab')) {
+        return;
+      }
 
       const activeGroup = event.target.parentElement;
       if (activeGroup.tabs.filter((tab) => !tab.hasAttribute('zen-empty-tab')).length === 0) {
@@ -777,7 +783,6 @@
           group.setAttribute('has-active', 'true');
           gBrowser.selectedTab = tab;
           this.#popup.hidePopup();
-          this.expandToSelected(group);
         });
 
         tabsList.appendChild(item);
@@ -853,6 +858,16 @@
       return [];
     }
 
+    getFolderIndentation(tab, group = undefined) {
+      const level = group?.level || 0;
+      const baseSpacing = 4; // Base spacing for each level
+      const tabLevel = tab?.group?.level || 0;
+      // If the level is less, we need to make a negative margin
+      const spacing =
+        level > tabLevel ? -baseSpacing * (level - tabLevel) : baseSpacing * (tabLevel - level);
+      return spacing;
+    }
+
     changeFolderUserIcon(group) {
       if (!group) return;
 

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -975,7 +975,7 @@
         const pinnedTabsTarget =
           event.target.closest('.zen-workspace-pinned-tabs-section') ||
           event.target.closest('.zen-current-workspace-indicator') ||
-          this._pinnedTabsContainer;
+          this._isGoingToPinnedTabs;
         const essentialTabsTarget = event.target.closest('.zen-essentials-container');
         const tabsTarget = event.target.closest('.zen-workspace-normal-tabs-section');
 
@@ -1253,6 +1253,12 @@
       if (!this.enabled) {
         return;
       }
+      const folderTarget = event.target.closest('zen-folder');
+      let isVertical = this.expandedSidebarMode;
+      //if (isVertical) {
+      //  draggedTab.style.marginInlineStart = `${gZenFolders.getFolderIndentation(draggedTab, folderTarget)}px`;
+      //}
+
       if (
         gBrowser.isTabGroupLabel(draggedTab) &&
         !draggedTab?.group?.hasAttribute('split-view-group')
@@ -1261,7 +1267,6 @@
         this.removeTabContainersDragoverClass();
         return;
       }
-      const folderTarget = event.target.closest('zen-folder');
       const pinnedTabsTarget = event.target.closest('.zen-workspace-pinned-tabs-section');
       const essentialTabsTarget = event.target.closest('.zen-essentials-container');
       const tabsTarget = event.target.closest('.zen-workspace-normal-tabs-section');
@@ -1283,7 +1288,6 @@
       }
 
       let shouldAddDragOverElement = false;
-      let isVertical = this.expandedSidebarMode;
 
       // Decide whether we should show a dragover class for the given target
       if (pinnedTabsTarget) {