Skip to content

Commit 7864a94

Browse files
authored
feat(app): add close other tabs and tabs after from the tab menu (#61631)
1 parent b3fd4a7 commit 7864a94

6 files changed

Lines changed: 363 additions & 163 deletions

File tree

‎packages/app/e2e/regression/tabs.spec.ts‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { mockServers } from "../utils/mock-server"
1919
import { fixture, mockStressTimeline } from "../utils/session-fixture"
2020
import { fileNode, mockWorkspace, openSession } from "../utils/workspace"
2121
import { expectSessionTitle } from "../utils/waits"
22+
import { openWithDirection } from "../utils/direction"
2223

2324
const a = { id: "ses_tab_a", title: "Tab A session" }
2425

@@ -242,6 +243,87 @@ test("the browser title names the open session and resets after leaving it", asy
242243
await expect(page).toHaveTitle("OpenCode")
243244
})
244245

246+
for (const [tabLayout, direction, label] of [
247+
["horizontal", "ltr", "Close tabs to the right"],
248+
["horizontal", "rtl", "Close tabs to the left"],
249+
["vertical", "ltr", "Close tabs below"],
250+
] as const) {
251+
test(`${tabLayout} ${direction} tab menus bulk close in visible order and reopen sessions`, async ({ page }) => {
252+
await mockWorkspace(page, {
253+
name: "Tabs",
254+
sessions: [a, b, c],
255+
seed: {
256+
tabs: [a.id, { draft: "draft_bulk_close", directory: "C:/OpenCode/Tabs" }, b.id, c.id],
257+
settings: { appearance: { tabLayout } },
258+
},
259+
})
260+
await openWithDirection(page, sessionHref(c.id), direction)
261+
262+
const titles = page.locator("[data-titlebar-tab-slot] [data-titlebar-tab-title]")
263+
264+
const draft = page.locator(`a[data-titlebar-tab-link][href="${draftHref("draft_bulk_close")}"]`)
265+
266+
const tabB = page.locator(`a[data-titlebar-tab-link][href="${sessionHref(b.id)}"]`)
267+
268+
const menu = page.getByRole("menu")
269+
270+
const active = page.locator('[data-titlebar-tab-slot][data-active="true"] [data-titlebar-tab-title]')
271+
272+
const modifier = await page.evaluate(() => (/Mac/.test(navigator.platform) ? "Meta" : "Control"))
273+
274+
await expect(titles).toHaveText([a.title, "Session", b.title, c.title])
275+
await draft.click({ button: "right" })
276+
await expect(active).toHaveText(c.title)
277+
await expect(menu.getByRole("menuitem")).toHaveText(["Close tab", "Close other tabs", label])
278+
await menu.getByRole("menuitem", { name: label, exact: true }).click()
279+
await expect(titles).toHaveText([a.title, "Session"])
280+
await expect(active).toHaveText("Session")
281+
282+
for (const expected of [
283+
[a.title, "Session", b.title],
284+
[a.title, "Session", b.title, c.title],
285+
]) {
286+
await page.keyboard.press(`${modifier}+Shift+t`)
287+
await expect(titles).toHaveText(expected)
288+
}
289+
290+
await page.locator(`a[data-titlebar-tab-link][href="${sessionHref(a.id)}"]`).click()
291+
await expect(active).toHaveText(a.title)
292+
await tabB.click({ button: "right" })
293+
await menu.getByRole("menuitem", { name: label, exact: true }).click()
294+
await expect(titles).toHaveText([a.title, "Session", b.title])
295+
await expect(active).toHaveText(a.title)
296+
await page.keyboard.press(`${modifier}+Shift+t`)
297+
await expect(titles).toHaveText([a.title, "Session", b.title, c.title])
298+
299+
await tabB.click({ button: "right" })
300+
await expect(menu.getByRole("menuitem")).toHaveText([
301+
"Rename",
302+
"Close tab",
303+
"Close other tabs",
304+
label,
305+
"Delete session…",
306+
])
307+
await menu.getByRole("menuitem", { name: "Close other tabs", exact: true }).click()
308+
await expect(titles).toHaveText([b.title])
309+
await expect(active).toHaveText(b.title)
310+
await tabB.click({ button: "right" })
311+
await expect(menu.getByRole("menuitem", { name: "Close other tabs", exact: true })).toBeDisabled()
312+
await expect(menu.getByRole("menuitem", { name: label, exact: true })).toBeDisabled()
313+
await page.keyboard.press("Escape")
314+
315+
for (const expected of [
316+
[a.title, b.title],
317+
[a.title, b.title, c.title],
318+
]) {
319+
await page.keyboard.press(`${modifier}+Shift+t`)
320+
await expect(titles).toHaveText(expected)
321+
}
322+
323+
await expect(draft).toHaveCount(0)
324+
})
325+
}
326+
245327
for (const tabLayout of ["horizontal", "vertical"] as const) {
246328
test(`a ${tabLayout} tab can be renamed again while its previous rename is still saving`, async ({ page }) => {
247329
await mockWorkspace(page, { name: "Tabs", sessions: [a, b], seed: { settings: { appearance: { tabLayout } } } })

‎packages/app/src/runtime/i18n/en.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,10 @@ export const dict = {
721721
"titlebar.tabs": "Tabs",
722722

723723
"common.closeTab": "Close tab",
724+
"common.closeOtherTabs": "Close other tabs",
725+
"common.closeTabsToRight": "Close tabs to the right",
726+
"common.closeTabsToLeft": "Close tabs to the left",
727+
"common.closeTabsBelow": "Close tabs below",
724728
"common.dismiss": "Dismiss",
725729
"common.moreCountSuffix": " (+{{count}} more)",
726730
"common.requestFailed": "Request failed",

‎packages/app/src/shell/tabs/tabs.tsx‎

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,21 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
200200
navigate(href)
201201
}
202202

203+
const disposeTab = (tab: Tab) => {
204+
const key = tabKey(tab)
205+
206+
memory.remove(key)
207+
removeInfo(key)
208+
removeRegions(key)
209+
210+
if (tab.type === "draft") removeDraftPersisted(tab.draftID)
211+
}
212+
203213
const removeTab = (index: number) => {
204214
const tab = store[index]
205215

206216
if (!tab) return
207217
const key = tabKey(tab)
208-
const draftID = tab.type === "draft" ? tab.draftID : undefined
209218
const nextTab = nextTabAfterClose(store, index, recentKey() === key && location.pathname !== "/")
210219
closing.add(key)
211220
void startTransition(() => {
@@ -222,11 +231,7 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
222231

223232
if (nextTab) navigateTab(nextTab)
224233
}).finally(() => closing.delete(key))
225-
memory.remove(key)
226-
removeInfo(key)
227-
removeRegions(key)
228-
229-
if (draftID) removeDraftPersisted(draftID)
234+
disposeTab(tab)
230235
}
231236

232237
const actions = {
@@ -419,6 +424,36 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
419424
if (tab.type === "session") updateClosed((stack) => pushClosedTab(stack, tab, index, info[tabKey(tab)]))
420425
removeTab(index)
421426
},
427+
closeTabs(keys: string[], keep: Tab) {
428+
const removed = new Set(keys)
429+
430+
const entries = store.flatMap((tab, index) => (removed.has(tabKey(tab)) ? [{ tab, index }] : []))
431+
432+
// Recording right-to-left lets successive reopens restore the original positions.
433+
updateClosed((stack) =>
434+
entries
435+
.toReversed()
436+
.reduce((stack, entry) => pushClosedTab(stack, entry.tab, entry.index, info[tabKey(entry.tab)]), stack),
437+
)
438+
439+
const active = recentKey()
440+
441+
entries.forEach((entry) => closing.add(tabKey(entry.tab)))
442+
void startTransition(() => {
443+
setStore((tabs) => tabs.filter((tab) => !removed.has(tabKey(tab))))
444+
445+
if (!active || !removed.has(active)) return
446+
447+
if (location.pathname === "/") {
448+
setRecentKey(tabKey(keep))
449+
450+
return
451+
}
452+
453+
navigateTab(keep)
454+
}).finally(() => entries.forEach((entry) => closing.delete(tabKey(entry.tab))))
455+
entries.forEach((entry) => disposeTab(entry.tab))
456+
},
422457
reopenClosedTab(target?: SessionTab, options?: { append?: boolean }) {
423458
if (!closedReady()) {
424459
void closedReady.promise?.then(() => actions.reopenClosedTab(target, options))

0 commit comments

Comments
 (0)