- BrowserView: 即使 host 在白名单,GUI 自身 origin 永不给 allow-same-origin(裸 host 条目覆盖所有端口时可提权) - intercept: revealInExplorer 相对路径经 resolveSidebarPath 解析后再 revealPaths(交付物路径是相对的) - intercept: ctx.betterSidebar 改为 ctx.get(#357 纤维链读取约定) - FileTree/EditorHost/TreePanel/tabs: 把 revealed 贯通到树行渲染 + 高亮类 + scrollIntoView(此前高亮永不渲染) - state.revealPaths: 重建祖先目录时保留前导分隔符(POSIX/UNC 此前目录永远折叠) - state.schedulePersist: 仅活动会话写入全局宽度(targeted open 不再用非活动会话的过期宽度覆盖拖拽值) - browser.probe: GET 回退显式取消 body(否则流式/大响应挂住 socket) - terminal-font: leading generic 前只放 symbols-only 字体;fully-patched 放 generic 后(避免 hijack 度量字体) - sidebar.module.css: 恢复拖拽反馈(#130 的 silent resize 与 PR 描述冲突,取 HEAD) - Sidebar: 剩余 4 处 ctx.betterSidebar 改 ctx.get - tests: 补 revealPaths/iframeSandboxFor/terminal-font 回归测试 + EditorHost/FileTree 测试补 revealed prop
176 lines
5.8 KiB
TypeScript
176 lines
5.8 KiB
TypeScript
/**
|
|
* Markdown refresh behavior: external edits are picked up only when the user
|
|
* explicitly clicks the refresh button, and unsaved drafts stay protected.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { createElement, useEffect } from 'react'
|
|
import { createRoot } from 'react-dom/client'
|
|
import { act } from 'react-dom/test-utils'
|
|
import type { Context } from '../src/context-types.ts'
|
|
import { EditorHost } from '../src/client/EditorHost.tsx'
|
|
import { api } from '../src/client/api.ts'
|
|
import { createBetterSidebarService, type FileViewerProps } from '../src/client/service.ts'
|
|
import { allLeaves, createSidebarStore, type SidebarTab } from '../src/client/state.ts'
|
|
|
|
;(globalThis as Record<string, unknown>).IS_REACT_ACT_ENVIRONMENT = true
|
|
|
|
function toolbar(dirty: boolean) {
|
|
return {
|
|
modes: true,
|
|
mode: 'preview' as const,
|
|
dirty,
|
|
editable: true,
|
|
saveState: 'idle' as const,
|
|
}
|
|
}
|
|
|
|
let markDirty: (() => void) | undefined
|
|
|
|
/** A tiny viewer that exposes the host toolbar and renders the loaded source. */
|
|
function FakeMarkdownViewer(props: FileViewerProps) {
|
|
useEffect(() => {
|
|
props.onToolbarControls?.({ setMode: () => {}, save: () => {} })
|
|
props.onToolbarState?.(toolbar(false))
|
|
markDirty = () => { props.onToolbarState?.(toolbar(true)) }
|
|
return () => {
|
|
markDirty = undefined
|
|
props.onToolbarControls?.(null)
|
|
}
|
|
}, [props.onToolbarControls, props.onToolbarState])
|
|
return createElement('div', { 'data-testid': 'markdown-content' }, props.content ?? '')
|
|
}
|
|
|
|
function setup(): {
|
|
store: ReturnType<typeof createSidebarStore>
|
|
ctx: Context
|
|
tab: SidebarTab
|
|
} {
|
|
const store = createSidebarStore()
|
|
const service = createBetterSidebarService(store)
|
|
service.registerTab({ id: 'editor', title: 'Editor', component: () => null })
|
|
service.registerFileViewer({
|
|
id: 'markdown',
|
|
exts: ['md'],
|
|
fetchStrategy: 'fsRead',
|
|
component: FakeMarkdownViewer,
|
|
})
|
|
store.setSession('markdown-manual-refresh-session')
|
|
const home = allLeaves(store.getSnapshot().state!.splits)
|
|
.flatMap(leaf => leaf.tabs)
|
|
.find(candidate => candidate.type === 'editor')!
|
|
const tab: SidebarTab = { ...home, path: '/tmp/notes.md', title: 'notes.md' }
|
|
const ctx = {
|
|
betterSidebar: service,
|
|
get: (name: string) => name === 'betterSidebar' ? service : undefined,
|
|
} as unknown as Context
|
|
return { store, ctx, tab }
|
|
}
|
|
|
|
function mount(ctx: Context, store: ReturnType<typeof createSidebarStore>, tab: SidebarTab) {
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const root = createRoot(container)
|
|
act(() => {
|
|
root.render(createElement(EditorHost, {
|
|
ctx,
|
|
store,
|
|
scope: { sessionId: 'markdown-manual-refresh-session', cwd: '/tmp' },
|
|
tab,
|
|
expanded: [],
|
|
revealed: [],
|
|
onToggleDir: () => {},
|
|
onReferenceFile: () => {},
|
|
}))
|
|
})
|
|
return {
|
|
container,
|
|
unmount: () => {
|
|
act(() => { root.unmount() })
|
|
container.remove()
|
|
},
|
|
}
|
|
}
|
|
|
|
async function flush(): Promise<void> {
|
|
await act(async () => {
|
|
await Promise.resolve()
|
|
await Promise.resolve()
|
|
})
|
|
}
|
|
|
|
afterEach(() => {
|
|
markDirty = undefined
|
|
vi.restoreAllMocks()
|
|
vi.useRealTimers()
|
|
})
|
|
|
|
describe('Markdown manual refresh', () => {
|
|
it('does not poll after an external edit and reloads only after clicking refresh', async () => {
|
|
vi.useFakeTimers()
|
|
let disk = 'before'
|
|
const read = vi.spyOn(api, 'fsRead').mockImplementation(async () => ({
|
|
kind: 'text', content: disk, truncated: false,
|
|
}))
|
|
const { store, ctx, tab } = setup()
|
|
const view = mount(ctx, store, tab)
|
|
try {
|
|
await flush()
|
|
expect(view.container.querySelector('[data-testid="markdown-content"]')?.textContent).toBe('before')
|
|
const initialReads = read.mock.calls.length
|
|
|
|
disk = 'after'
|
|
await act(async () => {
|
|
vi.advanceTimersByTime(3000)
|
|
await Promise.resolve()
|
|
await Promise.resolve()
|
|
})
|
|
expect(read.mock.calls.length).toBe(initialReads)
|
|
expect(view.container.querySelector('[data-testid="markdown-content"]')?.textContent).toBe('before')
|
|
|
|
const refresh = view.container.querySelector<HTMLButtonElement>('button[aria-label="刷新"], button[aria-label="Refresh"]')
|
|
expect(refresh).not.toBeNull()
|
|
act(() => { refresh!.click() })
|
|
await flush()
|
|
expect(read.mock.calls.length).toBeGreaterThan(initialReads)
|
|
expect(view.container.querySelector('[data-testid="markdown-content"]')?.textContent).toBe('after')
|
|
} finally {
|
|
view.unmount()
|
|
}
|
|
})
|
|
|
|
it('protects dirty content until the user confirms manual refresh', async () => {
|
|
let disk = 'before'
|
|
const read = vi.spyOn(api, 'fsRead').mockImplementation(async () => ({
|
|
kind: 'text', content: disk, truncated: false,
|
|
}))
|
|
const confirm = vi.spyOn(window, 'confirm').mockReturnValue(false)
|
|
const { store, ctx, tab } = setup()
|
|
const view = mount(ctx, store, tab)
|
|
try {
|
|
await flush()
|
|
expect(markDirty).toBeDefined()
|
|
act(() => { markDirty?.() })
|
|
await flush()
|
|
const before = read.mock.calls.length
|
|
disk = 'external'
|
|
|
|
const refresh = view.container.querySelector<HTMLButtonElement>('button[aria-label="刷新"], button[aria-label="Refresh"]')
|
|
expect(refresh).not.toBeNull()
|
|
act(() => { refresh!.click() })
|
|
await flush()
|
|
expect(confirm).toHaveBeenCalled()
|
|
expect(read.mock.calls.length).toBe(before)
|
|
expect(view.container.querySelector('[data-testid="markdown-content"]')?.textContent).toBe('before')
|
|
|
|
confirm.mockReturnValue(true)
|
|
act(() => { refresh!.click() })
|
|
await flush()
|
|
expect(read.mock.calls.length).toBeGreaterThan(before)
|
|
expect(view.container.querySelector('[data-testid="markdown-content"]')?.textContent).toBe('external')
|
|
} finally {
|
|
view.unmount()
|
|
}
|
|
})
|
|
})
|