Fixup tree when multiselected tabs are moved together from outside of…

… TST #3599
piroor · Aug 7, 2024 · 2271bc9 · 2271bc9
1 parent 5fb466a
commit 2271bc9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/webextensions/background/api-tabs-listener.js b/webextensions/background/api-tabs-listener.js
@@ -1014,7 +1014,10 @@ async function onMoved(tabId, moveInfo) {
       alreadyMoved,
       oldPreviousTab,
       oldNextTab,
-      isSubstantiallyMoved: movedTab.$TST.isSubstantiallyMoved
+      // Multiselected tabs can be moved together in bulk, by drag and drop
+      // in the horizontal tab bar, or addons like
+      // https://addons.mozilla.org/firefox/addon/move-tab-hotkeys/
+      movedInBulk: !maybeInternalOperation && (movedTab.$TST.multiselected || movedTab.$TST.movedInBulk),
     };
     log('tabs.onMoved: ', movedTab, extendedMoveInfo);
 

diff --git a/webextensions/background/background.js b/webextensions/background/background.js
@@ -785,7 +785,7 @@ Tab.onTabInternallyMoved.addListener((tab, info = {}) => {
 });
 
 Tab.onMoved.addListener((tab, moveInfo) => {
-  if (!moveInfo.isSubstantiallyMoved)
+  if (moveInfo.movedInBulk)
     return;
   reserveToUpdateInsertionPosition([
     tab,

diff --git a/webextensions/background/handle-moved-tabs.js b/webextensions/background/handle-moved-tabs.js
@@ -77,7 +77,7 @@ Tab.onMoving.addListener((tab, moveInfo) => {
       !positionControlled ||
       moveInfo.byInternalOperation ||
       moveInfo.alreadyMoved ||
-      moveInfo.isSubstantiallyMoved)
+      !moveInfo.movedInBulk)
     return true;
 
   // if there is no valid opener, it can be a restored initial tab in a restored window
@@ -197,7 +197,7 @@ reserveToEnsureRootTabVisible.tabIds = new Set();
 
 Tab.onMoved.addListener((tab, moveInfo = {}) => {
   if (moveInfo.byInternalOperation ||
-      moveInfo.isSubstantiallyMoved ||
+      !moveInfo.movedInBulk ||
       tab.$TST.duplicating) {
     log('internal move');
   }

diff --git a/webextensions/common/Tab.js b/webextensions/common/Tab.js
@@ -1922,22 +1922,23 @@ export default class Tab {
     this.lastNextTabId = this.unsafeNextTab?.id;
   }
 
-  get isSubstantiallyMoved() {
+  // https://github.com/piroor/treestyletab/issues/2309#issuecomment-518583824
+  get movedInBulk() {
     const previousTab = this.unsafePreviousTab;
     if (this.lastPreviousTabId &&
         this.lastPreviousTabId != previousTab?.id) {
-      log(`isSubstantiallyMoved lastPreviousTabId=${this.lastNextTabId}, previousTab=${previousTab?.id}`);
-      return true;
+      log(`not bulkMoved lastPreviousTabId=${this.lastNextTabId}, previousTab=${previousTab?.id}`);
+      return false;
     }
 
     const nextTab = this.unsafeNextTab;
     if (this.lastNextTabId &&
         this.lastNextTabId != nextTab?.id) {
-      log(`isSubstantiallyMoved lastNextTabId=${this.lastNextTabId}, nextTab=${nextTab?.id}`);
-      return true;
+      log(`not bulkMoved lastNextTabId=${this.lastNextTabId}, nextTab=${nextTab?.id}`);
+      return false;
     }
 
-    return false;
+    return true;
   }
 
   get sanitized() {