Merge pull request #46 from Lej77/patch-1

Get tree indent level from from openerTabId if TST isn't available, fixes #45
piroor · Oct 30, 2023 · 8262950 · 8262950
2 parents acd82c9 + a6579ea
commit 8262950
Showing 1 changed file with 25 additions and 9 deletions.
diff --git a/common/commands.js b/common/commands.js
@@ -91,19 +91,35 @@ export async function copyToClipboard(tabs, format) {
         tabs: tabs.map(tab => tab.id)
       }).catch(handleMissingReceiverError);
       const ancestorsOf = {};
-      const collectAncestors = (tab) => {
-        ancestorsOf[tab.id] = ancestorsOf[tab.id] || [];
-        for (const child of tab.children) {
-          collectAncestors(child);
-          ancestorsOf[child.id] = [tab.id].concat(ancestorsOf[tab.id]);
+      if (tabsWithChildren) {
+        // Data from Tree Style Tab:
+        const collectAncestors = (tab) => {
+          ancestorsOf[tab.id] = ancestorsOf[tab.id] || [];
+          for (const child of tab.children) {
+            collectAncestors(child);
+            ancestorsOf[child.id] = [tab.id].concat(ancestorsOf[tab.id]);
+          }
+        };
+        for (const tab of tabsWithChildren) {
+          collectAncestors(tab);
+        }
+      } else {
+        // Fallback to data from native Firefox tabs using the openerTabId, this
+        // property is usually kept in sync with tree structure by addons like
+        // TST or Sidebery:
+        for (const tab of tabs) {
+          // Note: apparently Sidebery sets the openerTabId to the tab's own id
+          // when it is a "root" tab.
+          if (tab.openerTabId !== undefined && tab.openerTabId !== tab.id) {
+            ancestorsOf[tab.id] = [tab.openerTabId].concat(ancestorsOf[tab.openerTabId] || []);
+          } else {
+            ancestorsOf[tab.id] = [];
+          }
         }
-      };
-      for (const tab of tabsWithChildren) {
-        collectAncestors(tab);
       }
       // ignore indent information for partial selection
       const ids = tabs.map(tab => tab.id);
-      indentLevels = tabsWithChildren.map(tab => {
+      indentLevels = tabs.map(tab => {
         return ancestorsOf[tab.id].filter(ancestorId => ids.indexOf(ancestorId) > -1).length
       });
     }