Skip to content

Commit 39be159

Browse files
committed
feat(tui): close tabs with middle click
1 parent 92ed74b commit 39be159

2 files changed

Lines changed: 74 additions & 3 deletions

File tree

‎packages/tui/src/component/session-tabs.tsx‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const ADD_TAB_WIDTH = 3
4747
const MARQUEE_DELAY = 600
4848
const MARQUEE_INTERVAL = 100
4949
const CONTEXT_MENU_WIDTH = 16
50+
const MIDDLE_MOUSE_BUTTON = 1
5051
const RIGHT_MOUSE_BUTTON = 2
5152

5253
type TabContextMenuState = {
@@ -541,6 +542,12 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
541542
onMouseOver={() => marquee.enter(tab.sessionID, title(), hoveredTitleWidth())}
542543
onMouseOut={() => marquee.leave(tab.sessionID)}
543544
onMouseDown={(event) => {
545+
if (event.button === MIDDLE_MOUSE_BUTTON) {
546+
setDragging(undefined)
547+
event.preventDefault()
548+
event.stopPropagation()
549+
return
550+
}
544551
if (event.button === RIGHT_MOUSE_BUTTON) {
545552
setDragging(undefined)
546553
if (!rail) return
@@ -561,9 +568,16 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
561568
}}
562569
onMouseUp={(event) => {
563570
if (event.button === RIGHT_MOUSE_BUTTON) return
571+
if (event.button === MIDDLE_MOUSE_BUTTON) {
572+
event.preventDefault()
573+
event.stopPropagation()
574+
tabs.close(tab.sessionID)
575+
return
576+
}
564577
release()
565578
}}
566579
onMouseDrag={(event) => {
580+
if (event.button === MIDDLE_MOUSE_BUTTON) return
567581
if (!rail) return
568582
const target = Math.max(
569583
0,
@@ -575,7 +589,10 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
575589
if (target !== index() && preview()?.index !== target)
576590
setPreview({ sessionID: tab.sessionID, index: target })
577591
}}
578-
onMouseDragEnd={release}
592+
onMouseDragEnd={(event) => {
593+
if (event.button === MIDDLE_MOUSE_BUTTON) return
594+
release()
595+
}}
579596
>
580597
<TabPulse
581598
top={-1}
@@ -1066,6 +1083,12 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
10661083
onMouseOver={() => marquee.enter(tab.sessionID, title(), hoveredTitleWidth())}
10671084
onMouseOut={() => marquee.leave(tab.sessionID)}
10681085
onMouseDown={(event) => {
1086+
if (event.button === MIDDLE_MOUSE_BUTTON) {
1087+
setDragging(undefined)
1088+
event.preventDefault()
1089+
event.stopPropagation()
1090+
return
1091+
}
10691092
if (event.button === RIGHT_MOUSE_BUTTON) {
10701093
setDragging(undefined)
10711094
setContextMenu({
@@ -1085,15 +1108,25 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
10851108
}}
10861109
onMouseUp={(event) => {
10871110
if (event.button === RIGHT_MOUSE_BUTTON) return
1111+
if (event.button === MIDDLE_MOUSE_BUTTON) {
1112+
event.preventDefault()
1113+
event.stopPropagation()
1114+
tabs.close(tab === NEW_SESSION_TAB ? undefined : tab.sessionID)
1115+
return
1116+
}
10881117
release()
10891118
}}
10901119
onMouseDrag={(event) => {
1120+
if (event.button === MIDDLE_MOUSE_BUTTON) return
10911121
if (tab === NEW_SESSION_TAB) return
10921122
const slot = slotAt(event.x)
10931123
if (slot !== undefined && slot !== tabNumber() - 1)
10941124
setPreview({ sessionID: tab.sessionID, index: slot })
10951125
}}
1096-
onMouseDragEnd={release}
1126+
onMouseDragEnd={(event) => {
1127+
if (event.button === MIDDLE_MOUSE_BUTTON) return
1128+
release()
1129+
}}
10971130
>
10981131
<TabPulse
10991132
enabled={animations()}

‎packages/tui/test/component/session-tabs-context-menu.test.tsx‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { createSignal, Show } from "solid-js"
55
import { ConfigProvider } from "../../src/config"
66
import { Keymap } from "../../src/context/keymap"
77
import { ThemeProvider } from "../../src/context/theme"
8-
import { TabContextMenu, type SessionTabsController } from "../../src/component/session-tabs"
8+
import { SessionTabs, TabContextMenu, type SessionTabsController } from "../../src/component/session-tabs"
99
import { DialogProvider } from "../../src/ui/dialog"
1010
import { ToastProvider } from "../../src/ui/toast"
1111
import { emptyThemeSource } from "../fixture/fixture"
@@ -59,3 +59,41 @@ test("clicking outside the tab context menu closes it", async () => {
5959
app.renderer.destroy()
6060
}
6161
})
62+
63+
test("middle-clicking a tab closes it", async () => {
64+
let closed: string | undefined
65+
const controller: SessionTabsController = {
66+
tabs: () => [{ sessionID: "session", title: "Session" }],
67+
current: () => "session",
68+
select: () => {},
69+
close: (sessionID) => (closed = sessionID),
70+
move: () => {},
71+
status: () => ({ unread: undefined, promptPulse: 0, attention: false, busy: false }),
72+
}
73+
const app = await testRender(
74+
() => (
75+
<TestTuiContexts>
76+
<ConfigProvider config={createTuiResolvedConfig()}>
77+
<Keymap.Provider>
78+
<ThemeProvider mode="dark" source={emptyThemeSource}>
79+
<ToastProvider>
80+
<DialogProvider>
81+
<SessionTabs controller={controller} animations={false} />
82+
</DialogProvider>
83+
</ToastProvider>
84+
</ThemeProvider>
85+
</Keymap.Provider>
86+
</ConfigProvider>
87+
</TestTuiContexts>
88+
),
89+
{ width: 80, height: 24 },
90+
)
91+
92+
try {
93+
await app.waitForFrame((frame) => frame.includes("Session"))
94+
await app.mockMouse.click(20, 0, 1)
95+
await app.waitFor(() => closed === "session")
96+
} finally {
97+
app.renderer.destroy()
98+
}
99+
})

0 commit comments

Comments
 (0)