Update visibility and label of the context menu correctly for tree pa…

…rent tab #55
piroor · Aug 2, 2024 · 7c1b6f2 · 7c1b6f2
1 parent 032eaa9
commit 7c1b6f2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/background/context-menu.js b/background/context-menu.js
@@ -351,7 +351,10 @@ async function onShown(info, tab) {
   await context.resolve();
 
   const multiselected = context.multiselectedTabs.length > 1;
-  const chooseFromMenu = (!multiselected && context.isTreeParent ? configs.modeForNoSelectionTree : configs.modeForNoSelection) == Constants.kCOPY_CHOOSE_FROM_MENU;
+  const chooseFromMenu = (
+    !multiselected &&
+    context.mode == Constants.kCOPY_CHOOSE_FROM_MENU
+  );
   log('onShown ', {
     chooseFromMenu,
     isTreeParent: context.isTreeParent,
@@ -372,7 +375,8 @@ async function onShown(info, tab) {
       !item.hiddenForTopLevelItem &&
       configs[item.config] &&
       hasMultipleVisibleItems &&
-      (context.shouldCopyMultipleTabs || (configs.modeForNoSelection != Constants.kCOPY_NOTHING))
+      (context.shouldCopyMultipleTabs ||
+       context.mode != Constants.kCOPY_NOTHING)
     );
     item.title = browser.i18n.getMessage(titleKey);
     if (lastVisible == item.visible &&

diff --git a/common/Context.js b/common/Context.js
@@ -153,17 +153,24 @@ export class Context {
   }
 
   get menuItemTitleKey() {
-    // detect tree parent at first
-    if (this.isTreeParent &&
-        configs.modeForNoSelectionTree != Constants.kCOPY_INHERIT) {
-      return this.shouldCopyOnlyDescendants ?
-        'context_copyTreeDescendants_label' :
-        'context_copyTree_label';
+    if (this.multiselectedTabs.length > 1)
+      return 'context_copyTab_label';
+
+    if (this.shouldCopyAll)
+      return 'context_copyAllTabs_label';
+
+    if (this.mode == Constants.kCOPY_INDIVIDUAL_TAB ||
+        configs.modeForNoSelectionTree == Constants.kCOPY_INHERIT)
+      return 'context_copyTab_label';
+
+    if (this.isTreeParent) {
+      if (this.shouldCopyOnlyDescendants)
+        return 'context_copyTreeDescendants_label';
+
+      return 'context_copyTree_label';
     }
 
-    return this.shouldCopyAll ?
-      'context_copyAllTabs_label' :
-      'context_copyTab_label';
+    return 'context_copyTab_label';
   }
 
   get isTreeParent() {
@@ -193,7 +200,10 @@ export class Context {
 
     return this.$shouldCopyMultipleTabs = (
       (this.isTreeParent &&
-       [...(this.shouldCopyOnlyDescendants ? [] : [this.tab]), ...(this.childTabs || this.descendantIds)]) ||
+       (this.mode == Constants.kCOPY_TREE ||
+        this.mode == Constants.kCOPY_TREE_DESCENDANTS) &&
+       [...(this.shouldCopyOnlyDescendants ? [] : [this.tab]),
+        ...(this.childTabs || this.descendantIds)]) ||
       this.multiselectedTabs
     ).length > 1;
   }