DSH 0.1.6-alpha.2 ships a right-Sidebar terminal and a right-Sidebar browser of its own. Both were things this plugin had built from scratch, so keeping them meant two implementations of one surface plus a plugin that shadows a host type the product is actively developing. Terminal: the plugin's whole PTY stack goes — the UI-tab manager, the agent-owned registry, the lazy node-pty loader, the eight model-facing terminal_* tools, the xterm view and its font/link/scrollback helpers, and the cross-session 'pinned terminal' rail that existed only to keep a terminal alive across a session switch. The host's terminal kind becomes the only provider, which also retires the node-pty dependency, its pnpm allowBuilds entry, and the installer's -Repair mode (issue #140's whole class of 'node-pty failed to load' support). Model-facing capability note: the plugin used to inject terminal_* tools (off by default). Those are the model's only cross-call persistent terminal, and DSH's own equivalent (@deepseek-ai/dsh-tool-terminal) is not mounted by any shipped bundle, so removing them leaves the model with the one-shot bash/pwsh tools only. That is the accepted cost of not maintaining a second PTY surface; the README documents how to enable the upstream toolset. Browser: the plugin's browser tab type is dropped, so the host's own browser kind owns embedded pages. The DOM-level link takeover STAYS (it is the only thing that can route an https link to the system browser by protocol, which the host does not do) but now delegates to the host's browser tab via ctx.sidebarRight.openTab('browser', …) with a window.open fallback, and the two settings that only ever configured the plugin's own iframe (sandbox escape hatch, loopback allowlist) go with it — along with the host-side browser.probe route they fed. Cards: the empty-pane welcome cards adopt the host's guide-capsule recipe (0.5px l4 hairline, 24px radius, layer-1 fill, 56px floor, 14px/20px padding) so the plugin's 'pick what opens here' surface reads as the same design as DSH's own. A theme.spec guard pins the geometry and the token-only paint — including that the upstream-only --dsw-alias-bg-l1/-l2 spellings (defined nowhere, so their declarations are silently dropped upstream) never appear here. Also drops the dead state the removed features left behind (SidebarTab.pin, nextTerminal, agentWaits, bottomOpenedOnce, the agent-tab helpers, the pinned-tab memo key), re-points every test fixture that used them at surviving equivalents, and prunes the specs of the deleted features.
211 lines
7.1 KiB
TypeScript
211 lines
7.1 KiB
TypeScript
/**
|
|
* Tab-strip right-click context-menu tests. Right-clicking a tab takes over
|
|
* the browser menu (preventDefault) and shows the tab context menu with
|
|
* exactly five items: move to free window / close / close others / close to
|
|
* the left / close to the right. All bulk operations are scoped to the
|
|
* CURRENT pane (the render time tab snapshot) and reuse the per-tab onClose
|
|
* path, so the target tab is never closed and the pane never empties
|
|
* mid-loop. The menu items gray out when there is nothing to close (single
|
|
* tab → close others; leftmost → close left; rightmost → close right).
|
|
* Opening the menu must not activate the right-clicked tab.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { createElement } from 'react'
|
|
import { createRoot, type Root } from 'react-dom/client'
|
|
import { act } from 'react-dom/test-utils'
|
|
|
|
// The act() environment flag (React 18.2 reads it before flushing effects).
|
|
import { setupReactAct } from './test-utils.ts'
|
|
setupReactAct()
|
|
|
|
import { TabBar } from '../src/client/TabBar.tsx'
|
|
import type { SidebarTab } from '../src/client/state.ts'
|
|
|
|
/** Point the browser-language fallback at Chinese so the menu labels assert. */
|
|
function stubZh(): void {
|
|
Object.defineProperty(globalThis, 'navigator', {
|
|
value: { language: 'zh-CN' },
|
|
configurable: true,
|
|
})
|
|
}
|
|
|
|
const MENU_LABELS = ['关闭', '关闭其他页签', '关闭左侧页签', '关闭右侧页签']
|
|
|
|
function mountBar(tabs: SidebarTab[], opts: { onPinTab?: (tabId: string, scope: 'workspace' | 'global' | null) => void } = {}): {
|
|
tabEls: HTMLElement[]
|
|
onClose: ReturnType<typeof vi.fn>
|
|
onActivate: ReturnType<typeof vi.fn>
|
|
onPinTab?: (tabId: string, scope: 'workspace' | 'global' | null) => void
|
|
unmount: () => void
|
|
} {
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const onClose = vi.fn()
|
|
const onActivate = vi.fn()
|
|
const onPinTab = opts.onPinTab
|
|
const root: Root = createRoot(container)
|
|
act(() => {
|
|
root.render(createElement(TabBar, {
|
|
paneId: 'pane:1',
|
|
tabs,
|
|
active: tabs[0]?.id ?? null,
|
|
onActivate,
|
|
onClose,
|
|
onNewTab: () => {},
|
|
newTabOptions: [],
|
|
...(onPinTab !== undefined ? { onPinTab } : {}),
|
|
onDropTab: () => {},
|
|
}))
|
|
})
|
|
const tabEls = [...container.querySelectorAll('[class*="tabList"] > [class*="tab"]')] as HTMLElement[]
|
|
return {
|
|
tabEls,
|
|
onClose,
|
|
onActivate,
|
|
...(onPinTab !== undefined ? { onPinTab } : {}),
|
|
unmount: () => {
|
|
act(() => { root.unmount() })
|
|
container.remove()
|
|
},
|
|
}
|
|
}
|
|
|
|
function fourTabs(): SidebarTab[] {
|
|
return [
|
|
{ id: 't1', type: 'editor', title: 'Tab 1' },
|
|
{ id: 't2', type: 'git', title: 'Tab 2' },
|
|
{ id: 't3', type: 'terminal', title: 'Tab 3' },
|
|
{ id: 't4', type: 'browser', title: 'Tab 4' },
|
|
]
|
|
}
|
|
|
|
/** Dispatch a native right-click (contextmenu) and return the event. */
|
|
function rightClick(target: EventTarget): MouseEvent {
|
|
const event = new MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 120, clientY: 40 })
|
|
target.dispatchEvent(event)
|
|
return event
|
|
}
|
|
|
|
/** The portaled menu rows (empty when the menu is closed). */
|
|
function menuItems(): HTMLElement[] {
|
|
return [...document.querySelectorAll<HTMLElement>('[role="menuitem"]')]
|
|
}
|
|
|
|
afterEach(() => {
|
|
document.body.innerHTML = ''
|
|
vi.restoreAllMocks()
|
|
})
|
|
|
|
describe('TabBar right-click context menu', () => {
|
|
it('opens the five-item menu at the cursor, prevents the browser menu, and does not activate', () => {
|
|
stubZh()
|
|
const { tabEls, onActivate, unmount } = mountBar(fourTabs())
|
|
try {
|
|
let event: MouseEvent | null = null
|
|
act(() => { event = rightClick(tabEls[1]!) })
|
|
expect(event!.defaultPrevented).toBe(true)
|
|
expect(menuItems().map(item => item.textContent)).toEqual(MENU_LABELS)
|
|
expect(onActivate).not.toHaveBeenCalled()
|
|
} finally {
|
|
unmount()
|
|
}
|
|
})
|
|
|
|
it('close closes the target tab and dismisses the menu', () => {
|
|
stubZh()
|
|
const { tabEls, onClose, unmount } = mountBar(fourTabs())
|
|
try {
|
|
act(() => { rightClick(tabEls[1]!) })
|
|
act(() => { menuItems()[0]!.click() })
|
|
expect(onClose).toHaveBeenCalledTimes(1)
|
|
expect(onClose).toHaveBeenCalledWith('t2')
|
|
expect(menuItems()).toHaveLength(0)
|
|
} finally {
|
|
unmount()
|
|
}
|
|
})
|
|
|
|
it('close closes only the target tab and closes the menu', () => {
|
|
stubZh()
|
|
const { tabEls, onClose, unmount } = mountBar(fourTabs())
|
|
try {
|
|
act(() => { rightClick(tabEls[1]!) })
|
|
act(() => { menuItems()[0]!.click() })
|
|
expect(onClose).toHaveBeenCalledTimes(1)
|
|
expect(onClose).toHaveBeenCalledWith('t2')
|
|
expect(menuItems()).toHaveLength(0)
|
|
} finally {
|
|
unmount()
|
|
}
|
|
})
|
|
|
|
it('close others closes every tab in the pane except the target, in visual order', () => {
|
|
stubZh()
|
|
const { tabEls, onClose, unmount } = mountBar(fourTabs())
|
|
try {
|
|
act(() => { rightClick(tabEls[1]!) })
|
|
act(() => { menuItems()[1]!.click() })
|
|
expect(onClose.mock.calls.map(call => call[0])).toEqual(['t1', 't3', 't4'])
|
|
expect(onClose).not.toHaveBeenCalledWith('t2')
|
|
expect(menuItems()).toHaveLength(0)
|
|
} finally {
|
|
unmount()
|
|
}
|
|
})
|
|
|
|
it('close left closes only the tabs to the left of the target', () => {
|
|
stubZh()
|
|
const { tabEls, onClose, unmount } = mountBar(fourTabs())
|
|
try {
|
|
act(() => { rightClick(tabEls[2]!) })
|
|
act(() => { menuItems()[2]!.click() })
|
|
expect(onClose.mock.calls.map(call => call[0])).toEqual(['t1', 't2'])
|
|
expect(menuItems()).toHaveLength(0)
|
|
} finally {
|
|
unmount()
|
|
}
|
|
})
|
|
|
|
it('close right closes only the tabs to the right of the target', () => {
|
|
stubZh()
|
|
const { tabEls, onClose, unmount } = mountBar(fourTabs())
|
|
try {
|
|
act(() => { rightClick(tabEls[1]!) })
|
|
act(() => { menuItems()[3]!.click() })
|
|
expect(onClose.mock.calls.map(call => call[0])).toEqual(['t3', 't4'])
|
|
expect(menuItems()).toHaveLength(0)
|
|
} finally {
|
|
unmount()
|
|
}
|
|
})
|
|
|
|
it('grays out close others on a single tab and close left/right at the strip ends', () => {
|
|
stubZh()
|
|
const single = mountBar([
|
|
{ id: 'only', type: 'editor', title: 'Only' },
|
|
])
|
|
try {
|
|
act(() => { rightClick(single.tabEls[0]!) })
|
|
const items = menuItems()
|
|
// The Menu renders each row as a disabled <button role="menuitem">.
|
|
expect(items.map(item => (item as HTMLButtonElement).disabled)).toEqual([false, true, true, true])
|
|
// Clicking the disabled row must not close anything.
|
|
act(() => { items[1]!.click() })
|
|
expect(single.onClose).not.toHaveBeenCalled()
|
|
} finally {
|
|
single.unmount()
|
|
}
|
|
|
|
const four = mountBar(fourTabs())
|
|
try {
|
|
act(() => { rightClick(four.tabEls[0]!) })
|
|
expect(menuItems().map(item => (item as HTMLButtonElement).disabled)).toEqual([false, false, true, false])
|
|
act(() => { rightClick(four.tabEls[3]!) })
|
|
expect(menuItems().map(item => (item as HTMLButtonElement).disabled)).toEqual([false, false, false, true])
|
|
} finally {
|
|
four.unmount()
|
|
}
|
|
})
|
|
})
|