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): 换 storeKey 当轮跳过横宽测量,旧占位宽不再写回
Zhang Yunjin6846d53651bb
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 302c668d0f..6ee7ba07b3 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@@ -399,26 +399,26 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fu// scrollLeft 拉回(评审:纵向滚动拉回横向位置)。记录本树已测得的最大内容宽,// 用一个绝对定位的扩展占位元素撑住滚动范围 —— 占位不参与行布局,行宽// (width:100%)不会被撑宽,alignRowHorizontally 的行右缘对齐保持原语义- // (评审:粘性 minWidth 会把短名滚出视口)。换树(storeKey 变)时重置。+ // (评审:粘性 minWidth 会把短名滚出视口)。+ // extent 绑定 storeKey:换树 / 切开关(storeKey 变)时先把占位卸载(条目换+ // key 不渲染旧占位),并**当轮跳过测量** —— 否则旧占位还挂在 DOM 里,测出的+ // scrollWidth 仍含旧宽,会把旧值写回、横条过长(评审:隐藏目录后横条仍过长)。// jsdom 无布局(scrollWidth 恒 0)时测得 0,不渲染占位。- const [stickyExtentWidth, setStickyExtentWidth] = useState(0);- const stickyExtentRef = useRef(0);- const stickyStoreKeyRef = useRef(tree.storeKey);+ const [extent, setExtent] = useState<{ storeKey: string; width: number }>({+ storeKey: tree.storeKey,+ width: 0,+ });const contentLayerRef = useRef<HTMLDivElement | null>(null);useLayoutEffect(() => {- if (stickyStoreKeyRef.current !== tree.storeKey) {- stickyStoreKeyRef.current = tree.storeKey;- stickyExtentRef.current = 0;- setStickyExtentWidth(0);+ if (extent.storeKey !== tree.storeKey) {+ setExtent({ storeKey: tree.storeKey, width: 0 });+ return; // 本轮 DOM 里还有旧占位,测了会把旧宽写回;等占位卸载后的下一轮。}const inner = contentLayerRef.current;if (!inner) return;const measured = inner.scrollWidth;- if (measured > stickyExtentRef.current) {- stickyExtentRef.current = measured;- setStickyExtentWidth(measured);- }- }, [rows, tree.storeKey]);+ if (measured > extent.width) setExtent({ storeKey: tree.storeKey, width: measured });+ }, [rows, tree.storeKey, extent]);// 滚动位置:onScroll 持续记录锚点;挂载 / 换 store / 重新激活时自动恢复。// treeIdentityKey 单独传入:hook 用它区分「同树换视口」(可继承位置)与@@ -633,12 +633,12 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fuemptyState) : (<div ref={contentLayerRef} className="relative w-full" style={{ height: virtualizer.getTotalSize() }}>- {stickyExtentWidth > 0 && (+ {extent.storeKey === tree.storeKey && extent.width > 0 && (<divaria-hiddendata-testid="tree-horizontal-extent"className="pointer-events-none absolute left-0 top-0 h-px"- style={{ width: stickyExtentWidth }}+ style={{ width: extent.width }}/>)}{virtualizer.getVirtualItems().map((vi) => {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 4c0abb6111..34b364026c 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@@ -328,36 +328,65 @@ describe('globals.css 里的 .tree-hscroll 规则', () => {/*** 评审(纵向滚动拉回横向位置):虚拟化只挂视口内的行,横向范围完全由当前* 挂载行撑出 —— 宽行被回收时范围缩小,浏览器会把 scrollLeft 拉回。用绝对定位- * 的扩展占位保留本树已测得的最大宽(不参与行布局,行宽不被撑宽),换树重置。+ * 的扩展占位保留本树已测得的最大宽(不参与行布局,行宽不被撑宽)。+ *+ * 评审追加(隐藏目录后横条仍过长):换 storeKey 的那一轮 effect 里旧占位还挂+ * 在 DOM 上,此时测量必须跳过 —— 否则旧占位贡献的 500 被写回、横条仍过长。+ * getter 模拟真实 scrollWidth = max(当前挂载内容宽, 占位宽)。*/- it('回收宽行不缩小横向范围:扩展占位保留已测得的最大宽,换树才重置', () => {+ it('回收宽行不缩小横向范围;换 storeKey 当轮不测量,旧占位宽不写回', () => {+ let contentWidth = 200;const { container, rerender } = render(<FileTreeView tree={makeTree()} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,);const inner = container.querySelector<HTMLElement>('div.relative.w-full')!;- Object.defineProperty(inner, 'scrollWidth', { configurable: true, value: 500 });-- // 宽行挂载时测得 500:占位把横向范围撑到 500。+ Object.defineProperty(inner, 'scrollWidth', {+ configurable: true,+ get() {+ const spacer = inner.querySelector<HTMLElement>('[data-testid="tree-horizontal-extent"]');+ const spacerWidth = spacer ? parseInt(spacer.style.width, 10) || 0 : 0;+ return Math.max(contentWidth, spacerWidth);+ },+ });++ // 宽行挂载(内容 500):占位把横向范围撑到 500。+ contentWidth = 500;rerender(<FileTreeView tree={makeTree()} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,);- const spacer = container.querySelector<HTMLElement>('[data-testid="tree-horizontal-extent"]')!;- expect(spacer).not.toBeNull();- expect(spacer.style.width).toBe('500px');+ expect(+ container.querySelector<HTMLElement>('[data-testid="tree-horizontal-extent"]')?.style.width,+ ).toBe('500px');- // 宽行被回收(后续测得更窄):占位不缩,横向滚动范围不变小。- Object.defineProperty(inner, 'scrollWidth', { configurable: true, value: 200 });+ // 宽行被回收(内容回落到 200):占位 500 继续撑住,横向范围不变小。+ contentWidth = 200;rerender(<FileTreeView tree={makeTree()} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,);- expect(spacer.style.width).toBe('500px');+ expect(+ container.querySelector<HTMLElement>('[data-testid="tree-horizontal-extent"]')?.style.width,+ ).toBe('500px');++ // 切开关(storeKey 变、同一棵树):当轮跳过测量(旧占位还挂载、会贡献 500)+ // → 占位卸载 → 下一轮按真实内容测得 200。旧占位的 500 不得写回。+ contentWidth = 200;+ const toggledTree = { ...makeTree(), storeKey: 'test-store::reveal', treeIdentityKey: 'test-store' };+ rerender(+ <FileTreeView tree={toggledTree} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,+ );+ expect(+ container.querySelector<HTMLElement>('[data-testid="tree-horizontal-extent"]')?.style.width,+ ).toBe('200px');- // 换树(storeKey 变):占位移除,等新树自己重新测量(先撤 stub 验证重置本身)。- Reflect.deleteProperty(inner, 'scrollWidth');+ // 换树(treeIdentityKey 也变):旧占位先卸载,新树按自己的内容重新测量+ // (内容 800 → 占位 800px,而不是沿用旧树的 500/200)。+ contentWidth = 800;const switchedTree = { ...makeFarTargetsTree(), storeKey: 'test-store-2', treeIdentityKey: 'test-store-2' };rerender(<FileTreeView tree={switchedTree} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,);- expect(container.querySelector('[data-testid="tree-horizontal-extent"]')).toBeNull();+ expect(+ container.querySelector<HTMLElement>('[data-testid="tree-horizontal-extent"]')?.style.width,+ ).toBe('800px');});});