Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(workdir-browse): 隐藏 tab 保留滚动容器,切回不再回到顶部

Zhang Yunjin721c032b17ae
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.tsx
index b21d9bb3e7..80e33a37ab 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
@@ -293,7 +293,18 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fu
// 就有上千行,两份并行渲染把展开的主线程阻塞直接翻倍。数据层(useFileTree 的
// store / watcher / 展开态持久化)都在父组件,这里只是不产出 DOM;切回来时按
// 当前 store 一次性渲染,不重新拉盘、不丢展开态。
- if (active === false) return null;
+ // 注意:行可以卸,**滚动容器本身必须留在 DOM**(同一位置同类型 → React 复用
+ // 节点,scrollTop 不丢)—— return null 会连容器一起卸掉,切回标签回到顶部
+ //(评审 P2)。
+ if (active === false) {
+ return (
+ <div
+ ref={containerRef}
+ className="tree-hscroll flex h-full w-full flex-col gap-px overflow-auto py-2"
+ aria-hidden
+ />
+ );
+ }
if (tree.initialLoading) {
// 本地首个 listDir <50ms,门控内保持空白(规则 7);远程慢通道超过阈值
diff --git a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.activeTab.test.tsx b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.activeTab.test.tsx
index 553f9d0e15..7afa6986ac 100644
--- a/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.activeTab.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/workdir-browse/__tests__/FileTreeView.activeTab.test.tsx
@@ -43,14 +43,30 @@ function makeTree(): UseFileTreeReturn {
afterEach(() => cleanup());
-describe('FileTreeView active prop(隐藏 tab 不渲染行)', () => {
- it('active=false 时不产出任何行 DOM', () => {
- const { container } = render(
- <FileTreeView active={false} tree={makeTree()} selectedPath={null} onSelectFile={vi.fn()} />,
+describe('FileTreeView active prop(隐藏 tab 不渲染行,容器保留)', () => {
+ it('active=false 时不产出任何行 DOM,但滚动容器留在 DOM(不丢 scrollTop)', () => {
+ const { container, rerender } = render(
+ <FileTreeView tree={makeTree()} selectedPath={null} onSelectFile={vi.fn()} />,
);
+ const scroller = container.querySelector('.tree-hscroll') as HTMLElement;
+ expect(scroller).not.toBeNull();
+ scroller.scrollTop = 200;
+ rerender(
+ <FileTreeView active={false} tree={makeTree()} selectedPath={null} onSelectFile={vi.fn()} />,
+ );
expect(container.querySelectorAll('[data-relpath]')).toHaveLength(0);
- expect(container.firstChild).toBeNull();
+ // 容器同一节点:scrollTop 不被重置(评审 P2:return null 会连容器卸掉,
+ // 切回标签回到顶部)。
+ const hiddenScroller = container.querySelector('.tree-hscroll') as HTMLElement;
+ expect(hiddenScroller).not.toBeNull();
+ expect(hiddenScroller.scrollTop).toBe(200);
+
+ rerender(
+ <FileTreeView active tree={makeTree()} selectedPath={null} onSelectFile={vi.fn()} />,
+ );
+ expect(container.querySelectorAll('[data-relpath]')).toHaveLength(2);
+ expect((container.querySelector('.tree-hscroll') as HTMLElement).scrollTop).toBe(200);
});
it('不传 active(doc 侧栏等单宿主场景)与 active=true 都照常渲染', () => {
@@ -65,4 +81,4 @@ describe('FileTreeView active prop(隐藏 tab 不渲染行)', () => {
);
expect(explicit.container.querySelectorAll('[data-relpath]')).toHaveLength(2);
});
-});
+});
\ No newline at end of file