feat: duplicate tab as a child

(resolves #1480)

Author: mbnuqw

src/_locales/dict.setup-page.ts

@@ -3374,6 +3374,13 @@ Beispiele: "*", "ctrl+$", "ctrl+alt+g"`,
     zh_CN: '复制',
     zh_TW: '複製',
   },
+  'settings.tab_action_dup_child': {
+    en: 'duplicate as a child',
+    ru: 'дублировать как дочернюю вкладку',
+    de: 'Als untergeordneten Tab duplizieren',
+    zh_CN: '复制为子选项卡',
+    zh_TW: '複製為子選項卡',
+  },
   'settings.tab_action_pin': {
     en: 'pin',
     ru: 'закрепить',

src/defaults/settings.ts

@@ -257,14 +257,14 @@ export const SETTINGS_OPTIONS = {
   hScrollAction: ['switch_panels', 'switch_act_tabs', 'none'],
   scrollThroughTabs: ['panel', 'global', 'psp', 'psg', 'none'],
   discardFoldedDelayUnit: ['sec', 'min'],
-  tabDoubleClick: ['reload', 'duplicate', 'pin', 'mute', 'clear_cookies', 'exp', 'new_after',
-    'new_child', 'close', 'edit_title', 'none'],
-  tabLongLeftClick: ['reload', 'duplicate', 'pin', 'mute', 'clear_cookies', 'new_after',
+  tabDoubleClick: ['reload', 'duplicate', 'dup_child', 'pin', 'mute', 'clear_cookies', 'exp',
+    'new_after', 'new_child', 'close', 'edit_title', 'none'],
+  tabLongLeftClick: ['reload', 'duplicate', 'dup_child', 'pin', 'mute', 'clear_cookies', 'new_after',
     'new_child', 'edit_title', 'none'],
-  tabLongRightClick: ['reload', 'duplicate', 'pin', 'mute', 'clear_cookies', 'new_after',
+  tabLongRightClick: ['reload', 'duplicate', 'dup_child', 'pin', 'mute', 'clear_cookies', 'new_after',
     'new_child', 'edit_title', 'none'],
-  tabMiddleClick: ['close', 'discard', 'duplicate', 'none'],
-  tabMiddleClickModifier: ['discard', 'duplicate', 'edit_title', 'none'],
+  tabMiddleClick: ['close', 'discard', 'duplicate', 'dup_child', 'none'],
+  tabMiddleClickModifier: ['discard', 'duplicate', 'dup_child', 'edit_title', 'none'],
   tabCloseMiddleClick: ['close', 'discard'],
   tabsPanelLeftClickAction: ['prev', 'expand', 'parent', 'tab', 'none'],
   tabsPanelDoubleClickAction: ['collapse', 'tab', 'undo', 'none'],

src/services/tabs.fg.actions.ts

@@ -1195,16 +1195,11 @@ export function repinTabs(tabIds: ID[]): void {
 /**
  * Duplicate tabs
  */
-export async function duplicateTabs(tabIds: ID[]): Promise<void> {
+export async function duplicateTabs(tabIds: ID[], asChild?: boolean): Promise<void> {
   const active = tabIds.length === 1
 
   // Sort tab ids
-  tabIds.sort((aId, bId) => {
-    const aTab = Tabs.byId[aId]
-    const bTab = Tabs.byId[bId]
-    if (!aTab || !bTab) return 0
-    return aTab.index - bTab.index
-  })
+  Tabs.sortTabIds(tabIds)
 
   const processed: ID[] = []
 
@@ -1251,7 +1246,7 @@ export async function duplicateTabs(tabIds: ID[]): Promise<void> {
     }
 
     const oldNewIds: Record<ID, ID> = {}
-    Tabs.setNewTabPosition(index, tab.parentId, dstPanelId)
+    Tabs.setNewTabPosition(index, asChild ? tab.id : tab.parentId, dstPanelId)
     const dupTab = await browser.tabs.duplicate(tabId, { active, index })
     oldNewIds[tabId] = dupTab.id
 

src/sidebar/components/tab.vue

@@ -221,6 +221,9 @@ function onMouseDown(e: MouseEvent): void {
       } else if (Settings.state.tabMiddleClickCtrl === 'duplicate') {
         Tabs.duplicateTabs([tab.id])
         return
+      } else if (Settings.state.tabMiddleClickCtrl === 'dup_child') {
+        Tabs.duplicateTabs([tab.id], true)
+        return
       } else if (Settings.state.tabMiddleClickCtrl === 'edit_title') {
         Tabs.editTabTitle([tab.id])
         return
@@ -234,6 +237,9 @@ function onMouseDown(e: MouseEvent): void {
       } else if (Settings.state.tabMiddleClickShift === 'duplicate') {
         Tabs.duplicateTabs([tab.id])
         return
+      } else if (Settings.state.tabMiddleClickShift === 'dup_child') {
+        Tabs.duplicateTabs([tab.id], true)
+        return
       } else if (Settings.state.tabMiddleClickShift === 'edit_title') {
         Tabs.editTabTitle([tab.id])
         return
@@ -249,6 +255,8 @@ function onMouseDown(e: MouseEvent): void {
         Tabs.discardTabs(selectedTabs)
       } else if (Settings.state.tabMiddleClick === 'duplicate') {
         Tabs.duplicateTabs([tab.id])
+      } else if (Settings.state.tabMiddleClick === 'dup_child') {
+        Tabs.duplicateTabs([tab.id], true)
       }
     }
   }
@@ -367,6 +375,7 @@ function onDoubleClick(): void {
   const dc = Settings.state.tabDoubleClick
   if (dc === 'reload') Tabs.reloadTabs([tab.id])
   if (dc === 'duplicate') Tabs.duplicateTabs([tab.id])
+  if (dc === 'dup_child') Tabs.duplicateTabs([tab.id], true)
   if (dc === 'pin') Tabs.repinTabs([tab.id])
   if (dc === 'mute') Tabs.remuteTabs([tab.id])
   if (dc === 'clear_cookies') Tabs.clearTabsCookies([tab.id])