Merge pull request #934 from NguyenDuck/feat/ctrl-tab-recents

feat: ctrl + tab switch to recent selected tab

src/components/TabSystem/TabSystem.ts

@@ -22,6 +22,7 @@ export interface IOpenTabOptions {
 export class TabSystem extends MonacoHolder {
  protected uuid = uuid()
  public tabs = <Ref<Tab[]>>ref([])
+ protected _recentSelectedTab = <Ref<Tab | undefined>>ref(undefined)
  protected _selectedTab = <Ref<Tab | undefined>>ref(undefined)
  protected get tabTypes() {
  return TabProvider.tabs
@@ -61,6 +62,10 @@ export class TabSystem extends MonacoHolder {
  )
  }
 
+ get recentSelectedTab() {
+ return this._recentSelectedTab.value
+ }
+
  get selectedTab() {
  return this._selectedTab.value
  }
@@ -219,6 +224,24 @@ export class TabSystem extends MonacoHolder {
  await previousTab.select()
  }
 
+ async hasRecentTab() {
+ return this.recentSelectedTab !== undefined
+ }
+
+ async selectRecentTab() {
+ const tabs = this.tabs.value
+ if (tabs.length === 0) return
+
+ const recentTab = this.recentSelectedTab
+ if (!recentTab) return
+
+ await recentTab.select()
+ }
+
+ async saveRecentTab(tab?: Tab) {
+ this._recentSelectedTab.value = tab
+ }
+
  async select(tab?: Tab) {
  if (this.isActive.value !== !!tab) this.setActive(!!tab)
 
@@ -229,6 +252,8 @@ export class TabSystem extends MonacoHolder {
  if (tab && tab !== this.selectedTab && this.project.isActiveProject) {
  App.eventSystem.dispatch('currentTabSwitched', tab)
  }
+
+ this.saveRecentTab(this.selectedTab)
  this._selectedTab.value = tab
 
  // Next steps don't need to be done if we simply unselect tab

src/components/Toolbar/Category/view.ts

@@ -45,7 +45,11 @@ export function setupViewCategory(app: App) {
  description: 'toolbar.view.nextTab.description',
  keyBinding: platform() === 'darwin' ? 'Meta + Tab' : 'Ctrl + Tab',
  onTrigger: () => {
- app.tabSystem?.selectNextTab()
+ if (app.tabSystem?.hasRecentTab()) {
+ app.tabSystem?.selectRecentTab()
+ } else {
+ app.tabSystem?.selectNextTab()
+ }
  },
  })
  )