Added: Option to switch panel after moving active tab to another panel

(mbnuqw#393)
ekmixon · Jun 3, 2021 · bbd9054 · bbd9054
1 parent ae3bac2
commit bbd9054
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/addon/defaults.js b/addon/defaults.js
@@ -114,6 +114,7 @@ export const DEFAULT_SETTINGS = {
   tabsUnreadMark: false,
   tabsReloadLimit: 5,
   tabsReloadLimitNotif: true,
+  tabsPanelSwitchActMove: true,
 
   // New tab position
   moveNewTabPin: 'start',

diff --git a/addon/locales/en.settings.js b/addon/locales/en.settings.js
@@ -171,6 +171,9 @@ export default {
   'settings.tabs_reload_limit_notif': {
     message: 'Show notification with the reloading progress',
   },
+  'settings.tabs_panel_switch_act_move': {
+    message: 'Switch panel after moving active tab to another panel',
+  },
 
   // --- New tab position
   'settings.new_tab_position': { message: 'Position of new tab' },

diff --git a/addon/locales/ru.settings.js b/addon/locales/ru.settings.js
@@ -180,6 +180,9 @@ export default {
   'settings.tabs_reload_limit_notif': {
     message: 'Показывать уведомление со статусом перезагрузки',
   },
+  'settings.tabs_panel_switch_act_move': {
+    message: 'Переключать панель после перемещения активной вкладки на другую панель',
+  },
 
   // --- New tab position
   'settings.new_tab_position': { message: 'Позиция новых вкладок' },

diff --git a/src/page.settings/components/settings.tabs.vue b/src/page.settings/components/settings.tabs.vue
@@ -101,6 +101,10 @@ section
       :inactive="!($store.state.tabsReloadLimit > 0)"
       :value="$store.state.tabsReloadLimitNotif"
       @input="setOpt('tabsReloadLimitNotif', $event)")
+  ToggleField(
+    label="settings.tabs_panel_switch_act_move"
+    :value="$store.state.tabsPanelSwitchActMove"
+    @input="setOpt('tabsPanelSwitchActMove', $event)")
 </template>
 
 <script>

diff --git a/src/sidebar/actions/tabs.js b/src/sidebar/actions/tabs.js
@@ -1577,11 +1577,9 @@ async function moveTabsToPanel(tabIds, panelId) {
   if (!activePanel || !activePanel.tabs) return
 
   let tabs = []
-  let activeTab
   for (let tabId of tabIds) {
     let tab = this.state.tabsMap[tabId]
     if (!tab) continue
-    if (tab.active) activeTab = tab
     tabs.push(tab)
   }
   let targetPanel = this.state.panelsMap[panelId]
@@ -1594,7 +1592,6 @@ async function moveTabsToPanel(tabIds, panelId) {
   if (this.state.tabsTree && activePanel.tabs.length > 0) {
     this.actions.updateTabsTree(activePanel.startIndex, activePanel.endIndex + 1)
   }
-  if (activeTab) this.state.panelIndex = targetPanel.index
   this.actions.saveTabsData()
   tabs.forEach(t => this.actions.saveTabData(t))
 }
@@ -1930,9 +1927,14 @@ async function moveDroppedNodes(dropIndex, dropParent, nodes, pin, currentPanel)
   }
 
   if (differentPanel) {
+    let hasActiveTab = false
     for (let tab of tabs) {
+      if (tab.active) hasActiveTab = true
       tab.panelId = currentPanel.id
     }
+    if (hasActiveTab && this.state.tabsPanelSwitchActMove) {
+      this.state.panelIndex = currentPanel.index
+    }
   }
   this.actions.updatePanelsTabs()