* feat(sidebar): 桌面兼容三方案——自动检测(WCO 标准几何)/壳预设/自定义 CSS 核心只保留 Web 标准机制,壳专属适配全部下沉到用户空间(KISS): - prefs 新增 titleBarScheme(默认 auto)/titleBarPresetId/customCss,旧 titleBarCompat 布尔自动迁移(true→custom 保留 stripPx,false/缺失→auto) - wco.ts:navigator.windowControlsOverlay 反应式几何(geometrychange 实时更新; visible=false 的幽灵 API 视为缺失),实现 #257 - titlebar-strip.ts 唯一 strip 取值链:WCO → dsh-desktop-titlebar-inset 契约参数 → 预设 stripFor → 手动 px → 0;desktop-env.ts 移除 win32 32px 硬编码 - shell-presets.ts 数据驱动预设(准入:issue/PR 提及 + 100+ star;v1 仅 anywhere-labs DSH Desktop:darwin 20px / win32 无 WCO 时 32px),opt-in 手动 - 预设/自定义 CSS 注入(data-dsh-preset-css / data-dsh-custom-css 标签), chrome 补稳定寻址面 data-dsh-toggle-cluster / data-dsh-panel - 交互 chrome 统一 -webkit-app-region: no-drag(吸收 #111/#153) - layout.css 底栏推挤复合锚点([data-pane] 与 :has(> [data-slot]) 双保险, rc.8 实测前者失效、后者命中,吸收 #226 思路) - 设置 UI:位置兼容模式齿轮弹窗改三方案(自动检测/壳兼容方案/自定义方案) - 测试:wco/titlebar-strip/shell-presets 单测 + prefs 迁移 + e2e 5 场景 (保守 auto/WCO 反应式/预设/自定义 CSS/复合锚点),挂载门禁 12/12 全绿 核心 grep 无壳专属类名;为某壳做的兼容在另一壳会再坏——预设与自定义 CSS 是唯一出路(AGENTS.md §8 契约已更新)。 * refine(sidebar): 位置兼容模式改主行下拉四选项——自动检测/DSH官方Web/壳预设/自定义 按用户反馈定稿 UI: - 主行下拉:自动检测(默认)/ DSH官方Web(显式零适配,连 WCO 也强制 0)/ 各壳预设(命中环境带「已检测」后缀,仅提示)/ 自定义方案(保留齿轮弹窗: 下移距离 + 自定义 CSS) - 旧文档迁移:titleBarCompat=true 或 titleBarStripPx 非默认值(此前已有配置) → 默认落到 custom 方案保留用户数值;干净文档 → auto - prefs 新增 'web' 方案;strip 取值链最优先处理 web→0 - 测试:prefs 迁移(stripPx 48→custom / 40→auto)、web 强制 0、下拉渲染断言 - 单测 693 通过,挂载 e2e 12/12 全绿 * refine(sidebar): 方案下拉复用 SelectMenu 组件,不用原生 <select> - 抽出可复用 SelectMenu(primitives Menu:锚点按钮 + 下拉选项卡,支持 icon/desc/多选),SelectRow 改为其薄壳 - 位置兼容模式方案下拉改用 SelectMenu;选项带描述(自动检测/DSH官方Web/ 各壳预设(命中带「已检测」后缀)/自定义方案) - 移除原生 select 样式;单测 693 通过,挂载 e2e 12/12 全绿
126 lines
4.7 KiB
TypeScript
126 lines
4.7 KiB
TypeScript
/**
|
|
* Window Controls Overlay (WCO) geometry store tests: feature detection,
|
|
* subscribe/getSnapshot, geometrychange re-reads, and the absent-API
|
|
* fallback (the conservative "auto" signal — plain browsers and non-overlay
|
|
* shells report NONE and the sidebar adapts nothing).
|
|
*/
|
|
import { afterEach, beforeEach, describe, expect, it } from 'vitest'
|
|
import './browser-globals.ts'
|
|
import {
|
|
getWcoSnapshot, setWcoSourceForTests, subscribeWco, WCO_NONE,
|
|
type WcoSource,
|
|
} from '../src/client/wco.ts'
|
|
|
|
/** A controllable fake of the standard API surface. */
|
|
function makeSource(initial: { width: number; height: number; visible?: boolean }): {
|
|
source: WcoSource
|
|
setRect: (width: number, height: number) => void
|
|
fireGeometryChange: () => void
|
|
listeners: Set<() => void>
|
|
} {
|
|
const listeners = new Set<() => void>()
|
|
let rect = { x: 0, y: 0, width: initial.width, height: initial.height }
|
|
const source: WcoSource = {
|
|
visible: initial.visible ?? true,
|
|
getTitlebarAreaRect: () => rect,
|
|
addEventListener: (type, listener) => { if (type === 'geometrychange') listeners.add(listener) },
|
|
removeEventListener: (type, listener) => { if (type === 'geometrychange') listeners.delete(listener) },
|
|
}
|
|
return {
|
|
source,
|
|
setRect: (width, height) => { rect = { x: 0, y: 0, width, height } },
|
|
fireGeometryChange: () => { for (const listener of listeners) listener() },
|
|
listeners,
|
|
}
|
|
}
|
|
|
|
beforeEach(() => {
|
|
setWcoSourceForTests(undefined)
|
|
})
|
|
|
|
afterEach(() => {
|
|
setWcoSourceForTests(undefined)
|
|
})
|
|
|
|
describe('wco geometry store', () => {
|
|
it('reports NONE (absent API) in plain browsers / non-overlay shells', () => {
|
|
expect(getWcoSnapshot()).toBe(WCO_NONE)
|
|
expect(getWcoSnapshot().present).toBe(false)
|
|
expect(getWcoSnapshot().height).toBe(0)
|
|
})
|
|
|
|
it('reads the real overlay rect once a source is present', () => {
|
|
const { source } = makeSource({ width: 138, height: 36 })
|
|
setWcoSourceForTests(source)
|
|
expect(getWcoSnapshot()).toEqual({ present: true, height: 36 })
|
|
})
|
|
|
|
it('rounds fractional overlay heights to whole pixels', () => {
|
|
const { source } = makeSource({ width: 100, height: 35.6 })
|
|
setWcoSourceForTests(source)
|
|
expect(getWcoSnapshot().height).toBe(36)
|
|
})
|
|
|
|
it('re-reads geometry on geometrychange (maximize/restore) and notifies subscribers', () => {
|
|
const { source, setRect, fireGeometryChange, listeners } = makeSource({ width: 138, height: 32 })
|
|
setWcoSourceForTests(source)
|
|
const calls: number[] = []
|
|
const off = subscribeWco(() => { calls.push(getWcoSnapshot().height) })
|
|
// Maximized: the overlay reports a zero/empty rect.
|
|
setRect(0, 0)
|
|
fireGeometryChange()
|
|
expect(getWcoSnapshot()).toEqual({ present: true, height: 0 })
|
|
expect(calls).toEqual([0])
|
|
// Restored.
|
|
setRect(138, 36)
|
|
fireGeometryChange()
|
|
expect(getWcoSnapshot()).toEqual({ present: true, height: 36 })
|
|
expect(calls).toEqual([0, 36])
|
|
// The disposer stops notifications.
|
|
off()
|
|
setRect(138, 40)
|
|
fireGeometryChange()
|
|
expect(calls).toEqual([0, 36])
|
|
expect(listeners.size).toBe(0)
|
|
})
|
|
|
|
it('treats a PHANTOM API (present but not visible) as absent — headless/macOS expose the interface with no overlay', () => {
|
|
const { source } = makeSource({ width: 0, height: 0, visible: false })
|
|
setWcoSourceForTests(source)
|
|
// present=false lets the strip chain fall through to the inset / preset
|
|
// / custom scheme instead of trusting an empty rect.
|
|
expect(getWcoSnapshot()).toEqual({ present: false, height: 0 })
|
|
// A real overlay flips to authoritative immediately.
|
|
const real = makeSource({ width: 138, height: 36, visible: true })
|
|
setWcoSourceForTests(real.source)
|
|
expect(getWcoSnapshot()).toEqual({ present: true, height: 36 })
|
|
})
|
|
|
|
it('treats a throwing API as absent (never breaks the layout)', () => {
|
|
const source: WcoSource = {
|
|
visible: true,
|
|
getTitlebarAreaRect: () => { throw new Error('racy API') },
|
|
addEventListener: () => {},
|
|
removeEventListener: () => {},
|
|
}
|
|
setWcoSourceForTests(source)
|
|
expect(getWcoSnapshot()).toEqual({ present: false, height: 0 })
|
|
})
|
|
|
|
it('re-attaches cleanly when the source is swapped (test hook)', () => {
|
|
const first = makeSource({ width: 138, height: 32 })
|
|
const second = makeSource({ width: 138, height: 36 })
|
|
setWcoSourceForTests(first.source)
|
|
expect(first.listeners.size).toBe(0) // no subscriber yet
|
|
const off = subscribeWco(() => {})
|
|
expect(first.listeners.size).toBe(1)
|
|
setWcoSourceForTests(second.source)
|
|
expect(first.listeners.size).toBe(0)
|
|
expect(second.listeners.size).toBe(1)
|
|
expect(getWcoSnapshot().height).toBe(36)
|
|
off()
|
|
setWcoSourceForTests(undefined)
|
|
expect(getWcoSnapshot()).toBe(WCO_NONE)
|
|
})
|
|
})
|