chore: followup bug 1933485: Ensure tab groups always appear in histo…

…ry menus
onemen · Dec 13, 2024 · 3886a3d · 3886a3d
1 parent 8557115
commit 3886a3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/addon/chrome/content/session/sessionStore.js b/addon/chrome/content/session/sessionStore.js
@@ -846,15 +846,8 @@ var TMP_ClosedTabs = {
     }
     const {closedTabSet, closedTabIndex} =
         TabmixSvc.SessionStore._getClosedTabStateFromUnifiedIndex(winData, closedTabState);
-    const groupIds = closedTabSet?.map(tabData => tabData.state.groupId);
     const closedTab = TabmixSvc.SessionStore.removeClosedTabData(winData, closedTabSet, closedTabIndex);
-    // temporary fix for bug 1933966
-    for (const groupId of groupIds) {
-      const group = TabmixSvc.SessionStore.getClosedTabGroup(source, groupId);
-      if (group?.tabs.length === 0) {
-        TabmixSvc.SessionStore.forgetClosedTabGroup(source, group.id);
-      }
-    }
+    TabmixSvc.SessionStore._cleanupOrphanedClosedGroups(winData);
 
     TabmixSvc.SessionStore._notifyOfClosedObjectsChange();
     return closedTab;

diff --git a/types/addon.d.ts b/types/addon.d.ts
@@ -814,6 +814,7 @@ declare namespace SessionStoreNS {
     const _windows: Record<SSi, WindowState>;
     const _closedWindows: ClosedWindowState[];
     let _closedObjectsChanged: boolean;
+    function _cleanupOrphanedClosedGroups(winData: WindowState): void;
     function _isWindowLoaded(aWindow: Window): boolean;
     function _notifyOfClosedObjectsChange(): void;
     function _getStateForClosedTabsAndClosedGroupTabs(winData: WindowState, aIndex: number): ClosedTabData;