Skip to content

Commit

Permalink
close right tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
SiriusXT committed Nov 1, 2024
1 parent 57a86c7 commit 7b24f7e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
14 changes: 13 additions & 1 deletion src/public/app/components/tab_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ export default class TabManager extends Component {
await this.removeNoteContext(ntxIdToRemove);
}
}

async closeOtherTabsCommand({ntxId}) {
for (const ntxIdToRemove of this.mainNoteContexts.map(nc => nc.ntxId)) {
if (ntxIdToRemove !== ntxId) {
Expand All @@ -560,6 +560,18 @@ export default class TabManager extends Component {
}
}

async closeRightTabsCommand({ntxId}) {
const ntxIds = this.mainNoteContexts.map(nc => nc.ntxId);
const index = ntxIds.indexOf(ntxId);

if (index !== -1) {
const idsToRemove = ntxIds.slice(index + 1);
for (const ntxIdToRemove of idsToRemove) {
await this.removeNoteContext(ntxIdToRemove);
}
}
}

async closeTabCommand({ntxId}) {
await this.removeNoteContext(ntxId);
}
Expand Down
3 changes: 2 additions & 1 deletion src/public/app/widgets/tab_row.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ export default class TabRowWidget extends BasicWidget {
y: e.pageY,
items: [
{title: t('tab_row.close'), command: "closeTab", uiIcon: "bx bx-x"},
{title: t('tab_row.close_other_tabs'), command: "closeOtherTabs", uiIcon: "bx bx-x"},
{title: t('tab_row.close_other_tabs'), command: "closeOtherTabs", uiIcon: "bx bx-x", enabled: appContext.tabManager.noteContexts.length !== 1},
{title: t('tab_row.close_right_tabs'), command: "closeRightTabs", uiIcon: "bx bx-x", enabled: appContext.tabManager.noteContexts.at(-1).ntxId !== ntxId},
{title: t('tab_row.close_all_tabs'), command: "closeAllTabs", uiIcon: "bx bx-x"},
{title: t('tab_row.move_tab_to_new_window'), command: "moveTabToNewWindow", uiIcon: "bx bx-window-open"}
],
Expand Down
1 change: 1 addition & 0 deletions src/public/translations/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,7 @@
"add_new_tab": "Add new tab",
"close": "Close",
"close_other_tabs": "Close other tabs",
"close_right_tabs": "Close right tabs",
"close_all_tabs": "Close all tabs",
"move_tab_to_new_window": "Move this tab to a new window",
"new_tab": "New tab"
Expand Down

0 comments on commit 7b24f7e

Please sign in to comment.