Fixed: Converting bookmarks panel to tabs panel

thezac · Apr 6, 2023 · 64231d5 · 64231d5
1 parent 870a039
commit 64231d5
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 8 deletions.
diff --git a/src/services/bookmarks.actions.ts b/src/services/bookmarks.actions.ts
@@ -363,7 +363,7 @@ export async function open(
 
         // Set url for parent node
         const prev = toOpen[toOpen.length - 1]
-        if (prev && prev.id === info.parentId && prev.title === info.title && info.url) {
+        if (prev && prev.id === info.parentId && bookmarkIsParentTab(node, prev.title)) {
           prev.url = info.url
           continue
         }
@@ -1409,3 +1409,27 @@ export function getTargetTabsPanelId(): ID {
   }
   return panelId
 }
+
+export function isFolderWithURL(folder: Bookmark): boolean {
+  if (!folder.children) return false
+
+  const firstChild = folder.children[0]
+  if (!firstChild?.url) return false
+
+  const title = folder.title
+  const childTitle = firstChild.title
+
+  if (childTitle === title) return true
+
+  return childTitle.startsWith(title) && childTitle[title.length + 1] === '['
+}
+
+function bookmarkIsParentTab(node: Bookmark, parentTitle?: string): boolean {
+  if (!node.url || !parentTitle) return false
+
+  const childTitle = node.title
+
+  if (childTitle === parentTitle) return true
+
+  return childTitle.startsWith(parentTitle) && childTitle[parentTitle.length + 1] === '['
+}
diff --git a/src/services/sidebar.actions.ts b/src/services/sidebar.actions.ts
@@ -1787,12 +1787,11 @@ export async function restoreFromBookmarks(panel: TabsPanel, silent?: boolean):
 
     // Set url for parent
     if (!node.url && node.children) {
-      const firstChild = node.children[0]
-
       // Use first child for parent tab
-      if (firstChild && firstChild.url && firstChild.title === node.title) {
+      const firstChild = node.children[0]
+      if (Bookmarks.isFolderWithURL(node)) {
         rawUrl = firstChild.url
-        info.url = Utils.normalizeUrl(firstChild.url, firstChild.title)
+        info.url = Utils.normalizeUrl(firstChild.url, node.title)
         usedAsParent[firstChild.id] = true
       }
 
@@ -1828,7 +1827,11 @@ export async function restoreFromBookmarks(panel: TabsPanel, silent?: boolean):
         active: false,
         cookieStoreId: info.container,
       }
-      Tabs.setNewTabPosition(indexPinned, NOID, panel.id)
+      Tabs.setNewTabPosition(indexPinned, NOID, panel.id, false)
+      if (info.url) {
+        const containerId = Containers.getContainerFor(info.url)
+        if (containerId) conf.cookieStoreId = containerId
+      }
       const newTab = await browser.tabs.create(conf)
       idsMap[info.id] = newTab.id
       indexPinned++
@@ -1877,13 +1880,17 @@ export async function restoreFromBookmarks(panel: TabsPanel, silent?: boolean):
         active: false,
         cookieStoreId: info.container,
       }
+      if (info.url) {
+        const containerId = Containers.getContainerFor(info.url)
+        if (containerId) conf.cookieStoreId = containerId
+      }
       const isDefaultContainer = !conf.cookieStoreId || conf.cookieStoreId === CONTAINER_ID
       const parentId = idsMap[info.parentId ?? NOID] ?? NOID
       if (conf.url && !conf.url.startsWith('about') && isDefaultContainer) {
         conf.discarded = true
         conf.title = info.title
       }
-      Tabs.setNewTabPosition(index, parentId, panel.id)
+      Tabs.setNewTabPosition(index, parentId, panel.id, false)
       const newTab = await browser.tabs.create(conf)
       idsMap[info.id] = newTab.id
     }

diff --git a/src/services/tabs.fg.actions.ts b/src/services/tabs.fg.actions.ts
@@ -3153,10 +3153,16 @@ export function updateTabsIndexes(fromIndex = 0, toIndex = -1): void {
 /**
  * Set expected position (parent/panel) of new tab by its index
  */
-export function setNewTabPosition(index: number, parentId: ID, panelId: ID): void {
+export function setNewTabPosition(
+  index: number,
+  parentId: ID,
+  panelId: ID,
+  unread?: boolean
+): void {
   Tabs.newTabsPosition[index] = {
     parent: parentId,
     panel: panelId,
+    unread: unread,
   }
 }
 

diff --git a/src/services/tabs.fg.handlers.ts b/src/services/tabs.fg.handlers.ts
@@ -163,6 +163,7 @@ function onTabCreated(tab: Tab, attached?: boolean): void {
     }
     index = tab.index
     tab.openerTabId = position.parent
+    if (position.unread !== undefined) tab.unread = position.unread
     delete Tabs.newTabsPosition[tab.index]
 
     // Handle tab reopening

diff --git a/src/types/tabs.ts b/src/types/tabs.ts
@@ -110,6 +110,7 @@ export interface ActiveTabsHistory {
 export interface NewTabPosition {
   parent: ID
   panel: ID
+  unread?: boolean
 }
 
 export interface GroupedTabInfo {