feat(tasks): 任务输出常驻浮动窗 + 节点卡去竖线 + 手机设置
三件事一起落地(用户 brief),各自独立可验证:
1) 后台任务输出改为常驻浮动窗
- 新增 src/client/FloatingWindow.tsx + .module.css:可复用组件,标题栏(拖拽手柄 +
复制/关闭)、内容区(自滚动,长输出不再跑出视口)、可选底部行、三个拉伸柄
(右/下/右下)。生命周期与 AnchoredPopover 相反:外部点击、失焦、锚点离屏都不关,
只有关闭按钮与 Escape 结束;尺寸只在挂载时量一次(流式输出帧不会挪动读者摆好的窗);
拖拽保持整窗在视口内(放不下才退化到保留 48px 可达);视口变化时夹回。
- 手势复用既有范式:移动走 window 级 pointermove(同 AnchoredPopover),拉伸走
setPointerCapture + createFrameBatcher(同 EditorHost 的面板拉伸)。
- JobOutputPopoverContent → JobOutputWindow;顺带修掉「跟随最新」从不滚动的 bug
(原先滚的是 TerminalBlock 外面那个永不滚动的 div),并清掉随旧弹窗死掉的
.popPre / .jobPopPre 规则。节点/工作流详情与任务窗保持原样。
2) 节点卡统一
- 删除两条左侧竖条(层级条 .cardTop::before、当前会话条 .nodeCurrent::before);
层级改由上段极淡底色承担(7/5/3.5/2.5% → 9/7/5/3.5% 补偿对比度);
当前会话改为 2px accent 描边(「边框加粗高亮」)。
- 圆角 4px → 8px(与浮动窗同一家族);成员/工作流/聚合按用户选择保留类型区分。
- 2px 而非 1.5px:真机 recon 发现 Chromium 在 DPR 1 下把亚像素边框向下取整,
1.5px 的「加粗」完全看不出(实测 borderTopWidth: "1px")。几何不受影响
(border-box + min-height,卡片外框 247×134 与预算逐像素一致)。
3) 手机设置
- 两个新偏好 mobileNoAutoOpen / mobileDefaultTree(默认都开),落到 prefs-shared、
PrefsSchema(volatile 自动)、parsePrefs 校验与设置页新增的「手机」分组。
- 窄屏(沿用 768px 断点)时:新子代理与新后台任务都不再自动激活任务页;
任务页默认树状图(页内切换仍是临时覆盖)。宽屏或开关关掉后行为完全不变。
- 5 条词条 ×20 份词典;外部插件指南的 PrefsSchema 键清单同步。
验证:typecheck / lint ✅;pnpm test 1254 passed / 9 skipped(新增 14 例);
挂载 lane 7/7(真实 DSH 0.1.7-rc.2);3080 真机自测通过(长输出窗口内部滚动
5459px/449px、拖拽 424→304、拉伸 1008×540→918×480、外部点击不关、Escape 关、
卡片 8px/2px/无竖条、窄屏不自动弹出且默认树状图)。
(cherry picked from commit 7d9b428c6c34d28ad2d60c2086496eb533902273)
This commit is contained in:
1 parent
5ea2f2d6ec
commit
d38fefe55d
38 files changed
+1300
-156
No files matched your search
@@ -10,6 +10,7 @@ import { createElement } from 'react'
|
||||
import { act } from 'react-dom/test-utils'
|
||||
import { renderRoot } from './test-utils.ts'
|
||||
import { SubagentView } from '../src/client/SubagentView.tsx'
|
||||
import { createSidebarStore } from '../src/client/state.ts'
|
||||
import type {
|
||||
Context,
|
||||
SidebarClientJobsService,
|
||||
@@ -232,6 +233,46 @@ describe('Tasks page interactions', () => {
|
||||
unmount()
|
||||
})
|
||||
|
||||
it('opens in the TREE by default on a narrow viewport when the mobile switch is on', async () => {
|
||||
// jsdom's window is the plugin's mobile bracket here (767 < 768).
|
||||
Object.defineProperty(window, 'innerWidth', { configurable: true, value: 420 })
|
||||
try {
|
||||
const store = makeStore(snapshotWithChildren(2))
|
||||
const sidebar = createSidebarStore()
|
||||
sidebar.setPrefs({ ...sidebar.getPrefs(), tasksViewMode: 'graph' })
|
||||
const first = renderRoot(
|
||||
createElement(SubagentView, {
|
||||
sessionId: 'root', active: true, ctx: makeCtx(store), store: sidebar,
|
||||
}),
|
||||
)
|
||||
await flushJobs()
|
||||
// The mobile adaptation wins over the wide-viewport default…
|
||||
expect(first.container.querySelector('[role="tree"]')).not.toBeNull()
|
||||
expect(first.container.querySelector('[role="group"]')).toBeNull()
|
||||
// …but the in-page toggle still switches this session's page ad hoc.
|
||||
const toGraph = first.container.querySelector('button[aria-label="切换为工作流图"]') as HTMLButtonElement
|
||||
await act(async () => { toGraph.click() })
|
||||
expect(first.container.querySelector('[role="group"]')).not.toBeNull()
|
||||
first.unmount()
|
||||
|
||||
// Disarming the switch restores the settings default (graph) on the same
|
||||
// narrow viewport.
|
||||
const off = makeStore(snapshotWithChildren(2))
|
||||
const offSidebar = createSidebarStore()
|
||||
offSidebar.setPrefs({ ...offSidebar.getPrefs(), tasksViewMode: 'graph', mobileDefaultTree: false })
|
||||
const second = renderRoot(
|
||||
createElement(SubagentView, {
|
||||
sessionId: 'root', active: true, ctx: makeCtx(off), store: offSidebar,
|
||||
}),
|
||||
)
|
||||
await flushJobs()
|
||||
expect(second.container.querySelector('[role="group"]')).not.toBeNull()
|
||||
second.unmount()
|
||||
} finally {
|
||||
Object.defineProperty(window, 'innerWidth', { configurable: true, value: 1024 })
|
||||
}
|
||||
})
|
||||
|
||||
it('toggles between graph and tree with the cluster visible in BOTH modes', async () => {
|
||||
const store = makeStore(snapshotWithChildren(2))
|
||||
const { container, unmount } = renderRoot(
|
||||
@@ -478,7 +519,7 @@ describe('Tasks page: owned tasks, host-primitive controls, draggable output', (
|
||||
unmount()
|
||||
})
|
||||
|
||||
it('drags the job output popover away from its anchor', async () => {
|
||||
it('opens the job output in the persistent floating window and drags it by its title bar', async () => {
|
||||
const store = makeStore(snapshotWithChildren(1))
|
||||
const { container, unmount } = renderRoot(
|
||||
createElement(SubagentView, { sessionId: 'root', active: true, ctx: makeCtx(store) }),
|
||||
@@ -486,15 +527,31 @@ describe('Tasks page: owned tasks, host-primitive controls, draggable output', (
|
||||
await flushJobs()
|
||||
const row = container.querySelector('button[aria-label*="sleep 300"]') as HTMLButtonElement
|
||||
await act(async () => { row.click() })
|
||||
const card = document.querySelector('[role="dialog"]') as HTMLElement
|
||||
expect(card).not.toBeNull()
|
||||
const before = { left: card.style.left, top: card.style.top }
|
||||
// The job output is a WINDOW, not the 280px anchored popover: it carries
|
||||
// the plugin's frame (a title bar to drag, a scrolling body).
|
||||
const frame = document.querySelector('[data-floating-window]') as HTMLElement
|
||||
expect(frame).not.toBeNull()
|
||||
expect(frame.getAttribute('aria-label')).toBe('sleep 300')
|
||||
expect(frame.querySelector('[data-window-body]')).not.toBeNull()
|
||||
// An outside click must NOT dismiss it (the window is persistent); Escape does.
|
||||
await act(async () => {
|
||||
card.dispatchEvent(new MouseEvent('pointerdown', { bubbles: true, clientX: 40, clientY: 40 }))
|
||||
document.body.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }))
|
||||
})
|
||||
expect(document.querySelector('[data-floating-window]')).not.toBeNull()
|
||||
|
||||
const before = { left: frame.style.left, top: frame.style.top }
|
||||
const handle = frame.querySelector('[data-window-handle]') as HTMLElement
|
||||
await act(async () => {
|
||||
handle.dispatchEvent(new MouseEvent('pointerdown', { bubbles: true, clientX: 40, clientY: 40 }))
|
||||
window.dispatchEvent(new MouseEvent('pointermove', { bubbles: true, clientX: 140, clientY: 120 }))
|
||||
window.dispatchEvent(new MouseEvent('pointerup', { bubbles: true }))
|
||||
})
|
||||
expect({ left: card.style.left, top: card.style.top }).not.toEqual(before)
|
||||
expect({ left: frame.style.left, top: frame.style.top }).not.toEqual(before)
|
||||
|
||||
await act(async () => {
|
||||
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }))
|
||||
})
|
||||
expect(document.querySelector('[data-floating-window]')).toBeNull()
|
||||
unmount()
|
||||
})
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user