Fixed save error while using PWA and enabled save tab groups (sienori…

…#981)
mohemohe · Sep 3, 2022 · 4f7f5c4 · 4f7f5c4
1 parent 0c5dce2
commit 4f7f5c4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/background/save.js b/src/background/save.js
@@ -82,8 +82,12 @@ export async function loadCurrentSession(name, tag, property) {
   }
 
   if (isEnabledTabGroups && getSettings("saveTabGroups")) {
-    const tabGroups = await queryTabGroups();
-    const filteredTabGroups = tabGroups.filter(tabGroup =>
+    // ポップアップやPWAにはタブ自体が存在しないので、normalタイプのウィンドウのみクエリする
+    const filteredWindows = Object.values(session.windowsInfo).filter(window => window.type === "normal");
+    const tabGroups = await Promise.all(filteredWindows.map(window => queryTabGroups({
+      windowId: window.id,
+    })));
+    const filteredTabGroups = tabGroups.flat().filter(tabGroup =>
       Object.keys(session.windows).includes(String(tabGroup.windowId)));
     if (filteredTabGroups.length > 0) session.tabGroups = filteredTabGroups;
   }