Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions src/background/space-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -724,18 +724,29 @@ export async function addTabsToFolder(
export async function importChromeTabGroups(windowId: number): Promise<Space[]> {
const groups = await chrome.tabGroups.query({ windowId })
const created: Space[] = []
for (const g of groups) {
let groupTabs: chrome.tabs.Tab[]
try {
groupTabs = await chrome.tabs.query({ groupId: g.id })
} catch {
continue
}
const store = await loadStore()
const claimed = new Set<number>()
for (const f of Object.values(store.folders)) {
for (const it of f.items) if (it.kind === 'tab') claimed.add(it.tabId)

const allTabs = await chrome.tabs.query({ windowId })
const tabsByGroupId = new Map<number, chrome.tabs.Tab[]>()
for (const tab of allTabs) {
if (tab.groupId !== undefined && tab.groupId !== chrome.tabGroups.TAB_GROUP_ID_NONE) {
let groupTabs = tabsByGroupId.get(tab.groupId)
if (!groupTabs) {
groupTabs = []
tabsByGroupId.set(tab.groupId, groupTabs)
}
groupTabs.push(tab)
}
}

const store = await loadStore()
const claimed = new Set<number>()
for (const f of Object.values(store.folders)) {
for (const it of f.items) if (it.kind === 'tab') claimed.add(it.tabId)
}

for (const g of groups) {
const groupTabs = tabsByGroupId.get(g.id) || []

const tabIds = groupTabs
.map((t) => t.id)
.filter((id): id is number => typeof id === 'number' && !claimed.has(id))
Expand Down