Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(workdir-browse): 滚动锚点只在同一棵树内继承,换树回到顶部或自身记录
Zhang Yunjin187b244e27ad
diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileTreeView.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileTreeView.tsxindex c7735169a4..1b1203ea7e 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileTreeView.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/FileTreeView.tsx@@ -394,8 +394,12 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fuvirtualizerRef.current = virtualizer;// 滚动位置:onScroll 持续记录锚点;挂载 / 换 store / 重新激活时自动恢复。+ // treeIdentityKey 单独传入:hook 用它区分「同树换视口」(可继承位置)与+ // 「换树」(切项目 / 换远端,位置不得跨树泄漏,评审 P2)。storeKey 含显示+ // 模式段,开关切换也会变,不能当树身份用。const handleScroll = useTreeScrollRestore(makeTreeScrollScope(scrollScope, tree.storeKey),+ tree.treeIdentityKey,rows,containerRef,active,diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.horizontalScroll.test.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.horizontalScroll.test.tsxindex 80b3e99daa..564de565df 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.horizontalScroll.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.horizontalScroll.test.tsx@@ -89,6 +89,7 @@ function makeFarTargetsTree(): UseFileTreeReturn {loadError: null,showIgnoredDirsSupported: true,storeKey: 'test-store',+ treeIdentityKey: 'test-store',toggleFolder: vi.fn(),collapseAll: vi.fn(),refresh: vi.fn(async () => undefined),@@ -109,6 +110,7 @@ function makeTree(): UseFileTreeReturn {loadError: null,showIgnoredDirsSupported: true,storeKey: 'test-store',+ treeIdentityKey: 'test-store',toggleFolder: vi.fn(),collapseAll: vi.fn(),refresh: vi.fn(async () => undefined),diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.imagePreview.test.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.imagePreview.test.tsxindex 7d0dee6194..f44b1f74b9 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.imagePreview.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.imagePreview.test.tsx@@ -29,6 +29,7 @@ function makeTree(): UseFileTreeReturn {loadError: null,showIgnoredDirsSupported: true,storeKey: 'test-store',+ treeIdentityKey: 'test-store',toggleFolder: vi.fn(),collapseAll: vi.fn(),refresh: vi.fn(async () => undefined),diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.inlineEdit.test.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.inlineEdit.test.tsxindex 6c6cd25625..d42cb147cf 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.inlineEdit.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.inlineEdit.test.tsx@@ -76,6 +76,7 @@ function makeTree(): UseFileTreeReturn {loadError: null,showIgnoredDirsSupported: true,storeKey: '/repo::hidden',+ treeIdentityKey: '/repo',toggleFolder: vi.fn(),collapseAll: vi.fn(),refresh: vi.fn(async () => undefined),diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.scroll.test.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.scroll.test.tsxindex 6ad977c1c0..c397cc2bd1 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.scroll.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.scroll.test.tsx@@ -64,6 +64,7 @@ function makeTree(opts: {expanded?: string[];storeKey?: string;}): UseFileTreeReturn {+ const storeKey = opts.storeKey ?? 'workdir::hidden';return {entries: new Map(opts.entries),expanded: new Set(opts.expanded ?? ['']),@@ -71,7 +72,8 @@ function makeTree(opts: {initialLoading: false,loadError: null,showIgnoredDirsSupported: true,- storeKey: opts.storeKey ?? 'workdir::hidden',+ storeKey,+ treeIdentityKey: storeKey.split('::')[0],toggleFolder: vi.fn(),collapseAll: vi.fn(),refresh: vi.fn(async () => undefined),diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useTreeScrollRestore.test.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useTreeScrollRestore.test.tsxindex 891ba499a3..b6fbdd94f7 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useTreeScrollRestore.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/__tests__/useTreeScrollRestore.test.tsx@@ -75,15 +75,17 @@ afterEach(() => {function Harness({scope,+ treeKey,rows,active = true,}: {scope: string;+ treeKey: string;rows: TreeRow[];active?: boolean;}) {const ref = useRef<HTMLDivElement>(null);- const onScroll = useTreeScrollRestore(scope, rows, ref, active);+ const onScroll = useTreeScrollRestore(scope, treeKey, rows, ref, active);return <div ref={ref} onScroll={onScroll} data-testid="viewport" />;}@@ -94,7 +96,7 @@ function viewportOf(container: HTMLElement): HTMLDivElement {describe('useTreeScrollRestore', () => {it('滚动时把「顶部行 + 行内偏移」写进锚点', () => {const scope = makeTreeScrollScope('tab-1', '/repo');- const { container } = render(<Harness scope={scope} rows={rows5} />);+ const { container } = render(<Harness scope={scope} treeKey="/repo" rows={rows5} />);const el = viewportOf(container);// 顶部留白 8 + 2 行 + 行内 4px。@@ -108,7 +110,7 @@ describe('useTreeScrollRestore', () => {const scope = makeTreeScrollScope('tab-1', '/repo');saveTreeScrollAnchor(scope, { rowKey: 'd.ts', offset: 3 });- const { container } = render(<Harness scope={scope} rows={rows5} />);+ const { container } = render(<Harness scope={scope} treeKey="/repo" rows={rows5} />);expect(viewportOf(container).scrollTop).toBe(8 + 3 * 29 + 3);});@@ -118,11 +120,11 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scope, { rowKey: 'e.ts', offset: 0 });const { container, rerender } = render(- <Harness scope={scope} rows={rows5.slice(0, 3)} />,+ <Harness scope={scope} treeKey="/repo" rows={rows5.slice(0, 3)} />,);expect(viewportOf(container).scrollTop).toBe(0);- rerender(<Harness scope={scope} rows={rows5} />);+ rerender(<Harness scope={scope} treeKey="/repo" rows={rows5} />);expect(viewportOf(container).scrollTop).toBe(8 + 4 * 29);});@@ -133,11 +135,11 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scopeB, { rowKey: 'e.ts', offset: 0 });const { container, rerender } = render(- <Harness scope={scopeA} rows={rows5} />,+ <Harness scope={scopeA} treeKey="/repo" rows={rows5} />,);expect(viewportOf(container).scrollTop).toBe(8);- rerender(<Harness scope={scopeB} rows={rows5} />);+ rerender(<Harness scope={scopeB} treeKey="/repo" rows={rows5} />);expect(viewportOf(container).scrollTop).toBe(8 + 4 * 29);});@@ -146,7 +148,7 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scope, { rowKey: 'c.ts', offset: 2 });setTestViewportSize(0);- const { container } = render(<Harness scope={scope} rows={rows5} />);+ const { container } = render(<Harness scope={scope} treeKey="/repo" rows={rows5} />);const el = viewportOf(container);el.scrollTop = 0;fireEvent.scroll(el);@@ -159,12 +161,12 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scope, { rowKey: 'd.ts', offset: 2 });const { container, rerender } = render(- <Harness scope={scope} rows={rows5} active={false} />,+ <Harness scope={scope} treeKey="/repo" rows={rows5} active={false} />,);const el = viewportOf(container);expect(el.scrollTop).toBe(0);- rerender(<Harness scope={scope} rows={rows5} active />);+ rerender(<Harness scope={scope} treeKey="/repo" rows={rows5} active />);expect(el.scrollTop).toBe(8 + 3 * 29 + 2);});@@ -173,7 +175,7 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scope, { rowKey: 'd.ts', offset: 1 });setTestViewportSize(0);- const { container } = render(<Harness scope={scope} rows={rows5} />);+ const { container } = render(<Harness scope={scope} treeKey="/repo" rows={rows5} />);expect(viewportOf(container).scrollTop).toBe(0);setTestViewportSize(600);@@ -186,7 +188,7 @@ describe('useTreeScrollRestore', () => {const scopeA = makeTreeScrollScope('tab-1', '/repo');const scopeB = makeTreeScrollScope('tab-1', '/repo::reveal');const { container, rerender } = render(- <Harness scope={scopeA} rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,+ <Harness scope={scopeA} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,);const el = viewportOf(container);@@ -196,7 +198,7 @@ describe('useTreeScrollRestore', () => {// 切到还没有锚点的放行态 store,且新树在 c.ts 上方插入两行(被忽略的目录)。rerender(- <Harness scope={scopeB} rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,+ <Harness scope={scopeB} treeKey="/repo" rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,);// 继承锚点:c.ts 仍对齐视口顶部,而不是保留旧像素落到 x.ts / y.ts 那一批。@@ -204,11 +206,48 @@ describe('useTreeScrollRestore', () => {expect(el.scrollTop).toBe(8 + 4 * 29);});+ it('换树(切项目 / 换远端)不继承旧树位置;新树无记录时回到顶部(评审 P2)', () => {+ const scopeA = makeTreeScrollScope('tab-1', '/repo-a');+ const scopeB = makeTreeScrollScope('tab-1', '/repo-b');+ const { container, rerender } = render(+ <Harness scope={scopeA} treeKey="/repo-a" rows={rows5} />,+ );+ const el = viewportOf(container);++ // 用户在项目 A 滚到 e.ts 顶部。+ el.scrollTop = 8 + 4 * 29;+ fireEvent.scroll(el);+ expect(loadTreeScrollAnchor(scopeA)).toEqual({ rowKey: 'e.ts', offset: 0 });++ // 切到项目 B(treeKey 变化):B 没有历史记录 —— 不得继承 A 的位置,+ // 也不能停在 A 残留的 DOM scrollTop 上,应回到顶部。+ rerender(<Harness scope={scopeB} treeKey="/repo-b" rows={rows5} />);+ expect(loadTreeScrollAnchor(scopeB)).toBeNull();+ expect(el.scrollTop).toBe(0);+ });++ it('换树后新树有自己的记录:恢复它自己的记录,而不是顶部或旧树位置(评审 P2)', () => {+ const scopeA = makeTreeScrollScope('tab-1', '/repo-a');+ const scopeB = makeTreeScrollScope('tab-1', '/repo-b');+ saveTreeScrollAnchor(scopeB, { rowKey: 'c.ts', offset: 2 });++ const { container, rerender } = render(+ <Harness scope={scopeA} treeKey="/repo-a" rows={rows5} />,+ );+ const el = viewportOf(container);+ el.scrollTop = 8 + 4 * 29;+ fireEvent.scroll(el);++ rerender(<Harness scope={scopeB} treeKey="/repo-b" rows={rows5} />);+ expect(el.scrollTop).toBe(8 + 2 * 29 + 2);+ expect(loadTreeScrollAnchor(scopeA)).toEqual({ rowKey: 'e.ts', offset: 0 });+ });+it('用户接管后的普通 resize 不回拉过期锚点;重新可见时仍恢复(评审 P2)', () => {const scope = makeTreeScrollScope('tab-1', '/repo');saveTreeScrollAnchor(scope, { rowKey: 'c.ts', offset: 0 });const { container, rerender } = render(- <Harness scope={scope} rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,+ <Harness scope={scope} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,);const el = viewportOf(container);expect(el.scrollTop).toBe(8 + 2 * 29);@@ -216,7 +255,7 @@ describe('useTreeScrollRestore', () => {// 用户接管(点击行),随后上方行增删但滚动位置没变、锚点没更新。fireEvent.pointerDown(el);rerender(- <Harness scope={scope} rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,+ <Harness scope={scope} treeKey="/repo" rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,);expect(el.scrollTop).toBe(8 + 2 * 29);@@ -237,13 +276,13 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scope, { rowKey: 'c.ts', offset: 0 });const { container, rerender } = render(- <Harness scope={scope} rows={makeRows(['a.ts', 'b.ts', 'c.ts'])} />,+ <Harness scope={scope} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts', 'c.ts'])} />,);const el = viewportOf(container);expect(el.scrollTop).toBe(8 + 2 * 29);// 上方插入两行:锚点行仍在顶部(换 store 后数据分批到达的缩影)。- rerender(<Harness scope={scope} rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts'])} />);+ rerender(<Harness scope={scope} treeKey="/repo" rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts'])} />);expect(el.scrollTop).toBe(8 + 4 * 29);});@@ -256,13 +295,13 @@ describe('useTreeScrollRestore', () => {setTestViewportSize(100);const { container, rerender } = render(- <Harness scope={scope} rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts', 'e.ts', 'f.ts'])} />,+ <Harness scope={scope} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts', 'e.ts', 'f.ts'])} />,);const el = viewportOf(container);Object.defineProperty(el, 'scrollHeight', { configurable: true, value: 190 });// 重新触发一次恢复:目标 8+5*29=153 > maxScroll(90) → 写入 90。rerender(- <Harness scope={scope} rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts', 'e.ts', 'f.ts'])} />,+ <Harness scope={scope} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts', 'e.ts', 'f.ts'])} />,);expect(el.scrollTop).toBe(90);@@ -274,6 +313,7 @@ describe('useTreeScrollRestore', () => {rerender(<Harnessscope={scope}+ treeKey="/repo"rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts', 'e.ts', 'f.ts', 'g.ts', 'h.ts', 'i.ts', 'j.ts'])}/>,);@@ -285,7 +325,7 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scope, { rowKey: 'c.ts', offset: 10 });const { container, rerender } = render(- <Harness scope={scope} rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,+ <Harness scope={scope} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts', 'c.ts', 'd.ts'])} />,);const el = viewportOf(container);expect(el.scrollTop).toBe(8 + 2 * 29 + 10);@@ -295,7 +335,7 @@ describe('useTreeScrollRestore', () => {el.scrollTop = 8 + 2 * 29 + 2;fireEvent.scroll(el);- rerender(<Harness scope={scope} rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts', 'd.ts'])} />);+ rerender(<Harness scope={scope} treeKey="/repo" rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts', 'd.ts'])} />);expect(el.scrollTop).toBe(8 + 4 * 29 + 10);});@@ -304,7 +344,7 @@ describe('useTreeScrollRestore', () => {saveTreeScrollAnchor(scope, { rowKey: 'c.ts', offset: 0 });const { container, rerender } = render(- <Harness scope={scope} rows={makeRows(['a.ts', 'b.ts', 'c.ts'])} />,+ <Harness scope={scope} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts', 'c.ts'])} />,);const el = viewportOf(container);expect(el.scrollTop).toBe(8 + 2 * 29);@@ -312,7 +352,7 @@ describe('useTreeScrollRestore', () => {// 用户点了一下行(展开 / 选中都是 pointerdown):即使还没滚动,也交还控制权。fireEvent.pointerDown(el);- rerender(<Harness scope={scope} rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts'])} />);+ rerender(<Harness scope={scope} treeKey="/repo" rows={makeRows(['x.ts', 'y.ts', 'a.ts', 'b.ts', 'c.ts'])} />);// 保持用户当前的像素位置,不被拉回锚点行(c.ts 已位移到 index 4)。expect(el.scrollTop).toBe(8 + 2 * 29);});@@ -321,14 +361,14 @@ describe('useTreeScrollRestore', () => {const scope = makeTreeScrollScope('tab-1', '/repo');saveTreeScrollAnchor(scope, { rowKey: 'e.ts', offset: 0 });- const { container, rerender } = render(<Harness scope={scope} rows={rows5} />);+ const { container, rerender } = render(<Harness scope={scope} treeKey="/repo" rows={rows5} />);const el = viewportOf(container);expect(el.scrollTop).toBe(8 + 4 * 29);// 用户滚回顶部:锚点被覆盖,之后的 rows 更新不应把视图拉回旧位置。el.scrollTop = 0;fireEvent.scroll(el);- rerender(<Harness scope={scope} rows={makeRows(['a.ts', 'b.ts'])} />);+ rerender(<Harness scope={scope} treeKey="/repo" rows={makeRows(['a.ts', 'b.ts'])} />);expect(el.scrollTop).toBe(0);expect(loadTreeScrollAnchor(scope)).toEqual({ rowKey: 'a.ts', offset: 0 });diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.tsindex fdf36f69c5..d83cc0c006 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useFileTree.ts@@ -130,6 +130,10 @@ export interface UseFileTreeReturn {* 锚点、DOM 复用判定)用它,而不是靠对象引用。 */storeKey: string;+ /** 树身份(workdir + 远端/设备,不含显示模式段)。开关「显示被忽略的目录」不变;+ * 切项目 / 换远端才变 —— 滚动锚点继承靠它区分「同树换视口」与「换树」。 */+ treeIdentityKey: string;+toggleFolder: (relPath: string) => void;/** Collapse every folder back to root. Also clears persisted state. */collapseAll: () => void;@@ -243,6 +247,19 @@ function storeKey(opts: Required<UseFileTreeOptions>): string {return `${opts.workdir}::doc=${opts.docMode}::hideMeta=${opts.hideMetaFiles}${reveal}${remote}${device}`;}+/** 树身份:工作目录 + 远端/设备,不含显示模式段(reveal / doc / hideMeta)。+ * 开关「显示被忽略的目录」不变;切项目 / 换远端才变。滚动锚点继承用它区分+ * 「同树换视口」(可继承位置)与「换树」(位置不得跨树泄漏,评审 P2)。 */+function treeIdentityKey(+ workdir: string,+ remoteHostId: string | null,+ deviceId: string | null,+): string {+ const remote = remoteHostId ? `::remote=${remoteHostId}` : '';+ const device = deviceId ? `::device=${deviceId}` : '';+ return `${workdir}${remote}${device}`;+}+function emit(store: FileTreeStore): void {for (const l of store.listeners) l();}@@ -859,6 +876,7 @@ export function useFileTree({// 非 device 会话恒 true;device 会话见上面探测注释。showIgnoredDirsSupported: deviceId ? deviceRevealSupported : true,storeKey: store.key,+ treeIdentityKey: treeIdentityKey(store.workdir, store.remoteHostId, store.deviceId),toggleFolder: toggleFolderCb,collapseAll: collapseAllCb,refresh: refreshCb,diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useTreeScrollRestore.ts b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useTreeScrollRestore.tsindex 2ed5515fd2..f5cdbfee47 100644--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useTreeScrollRestore.ts+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/hooks/useTreeScrollRestore.ts@@ -36,6 +36,7 @@ const RESTORE_EPSILON_PX = 1;export function useTreeScrollRestore(scope: string,+ treeKey: string,rows: readonly TreeRow[],containerRef: RefObject<HTMLElement | null>,active = true,@@ -43,10 +44,16 @@ export function useTreeScrollRestore(const rowsRef = useRef(rows);rowsRef.current = rows;const scopeRef = useRef(scope);+ /** 树身份(storeKey = 工作目录 + 远端)。与 scope 分开传:scope 同时含视口身份,+ * 而视口与树可能独立变化 —— 只有「同树换视口」才允许继承位置(评审 P2)。 */+ const treeKeyRef = useRef(treeKey);/** 最近一次观察到的视口顶部行(onScroll 更新)。换到没有历史锚点的 scope 时* 继承它 —— 否则新树的 DOM 保留旧像素 scrollTop,而被忽略目录 / 分批数据在* 上方插入行后,视口会落到另一批条目上(评审 P2)。 */const lastAnchorRef = useRef<TreeScrollAnchor | null>(null);+ /** 换树后的一次性「回到顶部」:新树若无自己的记录,应从顶部开始,而不是停在+ * 旧树残留的 DOM scrollTop 上。 */+ const awaitTopRestoreRef = useRef(false);/** 还有一次「待完成」的恢复:scope 变化 / 重新激活时置位。* 注意:找到锚点行后**不**立即清除 —— 换 store 时新树是分批长出来的,锚点行* 的 index 会随后续数据到达而位移,要跟到树稳定为止。清除只发生在用户自己@@ -58,11 +65,21 @@ export function useTreeScrollRestore(if (scopeRef.current !== scope) {const previousScope = scopeRef.current;scopeRef.current = scope;- // 首次进入的 scope(例如第一次打开「显示被忽略的目录」)没有历史锚点:继承- // 切换前视口顶部的行,保持「看同一批条目」。只继承一次,之后由滚动 / 接管更新。- if (!loadTreeScrollAnchor(scope)) {- const inherited = lastAnchorRef.current ?? loadTreeScrollAnchor(previousScope);- if (inherited) saveTreeScrollAnchor(scope, inherited);+ const sameTree = treeKeyRef.current === treeKey;+ treeKeyRef.current = treeKey;+ if (sameTree) {+ // 同一棵树的视口切换(例如第一次打开「显示被忽略的目录」)没有历史锚点:+ // 继承切换前视口顶部的行,保持「看同一批条目」。只继承一次,之后由滚动 /+ // 接管更新。+ if (!loadTreeScrollAnchor(scope)) {+ const inherited = lastAnchorRef.current ?? loadTreeScrollAnchor(previousScope);+ if (inherited) saveTreeScrollAnchor(scope, inherited);+ }+ } else {+ // 换了树(切项目 / 换远端,storeKey 变化):旧树的位置不许泄漏 —— 丢弃+ // 最后视口锚点,新 scope 用它自己的记录,没有记录就由 tryRestore 回到顶部。+ lastAnchorRef.current = null;+ awaitTopRestoreRef.current = true;}pendingRestoreRef.current = true;}@@ -81,6 +98,14 @@ export function useTreeScrollRestore(if (!el || el.clientHeight === 0) return false;const anchor = loadTreeScrollAnchor(scopeRef.current);if (!anchor) {+ if (awaitTopRestoreRef.current) {+ // 换树且新树没有记录:把旧树残留的 DOM scrollTop 清回顶部(评审 P2)。+ awaitTopRestoreRef.current = false;+ if (el.scrollTop !== 0) {+ programmaticScrollRef.current = 0;+ el.scrollTop = 0;+ }+ }pendingRestoreRef.current = false;return true;}