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): 虚拟化行回收不缩小横向范围——内容层保留已测最大宽

Zhang Yunjinb8e4c148f7bf
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 1b1203ea7e..310938e57a 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
@@ -50,6 +50,7 @@ import {
useCallback,
useEffect,
useImperativeHandle,
+ useLayoutEffect,
useMemo,
useRef,
useState,
@@ -393,6 +394,30 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fu
const virtualizerRef = useRef(virtualizer);
virtualizerRef.current = virtualizer;
+ // 横向范围的粘性下限:虚拟化只挂视口内的行,横向范围完全由当前挂载行撑出 ——
+ // 用户向右滚到深层长名后再纵向滚开,宽行被回收、横向范围缩小,浏览器会把
+ // scrollLeft 拉回(评审:纵向滚动拉回横向位置)。记录本树已测得的最大内容宽,
+ // 作为内容层的单调不减 minWidth;换树(storeKey 变)时重置。jsdom 无布局
+ // (scrollWidth 恒 0),直接操作 DOM 不额外渲染。#4436 的行宽契约不变:
+ // 行仍 min-w-max,这里只是不让「测得过的最大宽」随回收缩水。
+ const contentLayerRef = useRef<HTMLDivElement | null>(null);
+ const stickyMinWidthRef = useRef(0);
+ const stickyStoreKeyRef = useRef(tree.storeKey);
+ useLayoutEffect(() => {
+ const inner = contentLayerRef.current;
+ if (!inner) return;
+ if (stickyStoreKeyRef.current !== tree.storeKey) {
+ stickyStoreKeyRef.current = tree.storeKey;
+ stickyMinWidthRef.current = 0;
+ inner.style.minWidth = '';
+ }
+ const measured = inner.scrollWidth;
+ if (measured > stickyMinWidthRef.current) {
+ stickyMinWidthRef.current = measured;
+ inner.style.minWidth = `${measured}px`;
+ }
+ }, [rows, tree.storeKey]);
+
// 滚动位置:onScroll 持续记录锚点;挂载 / 换 store / 重新激活时自动恢复。
// treeIdentityKey 单独传入:hook 用它区分「同树换视口」(可继承位置)与
// 「换树」(切项目 / 换远端,位置不得跨树泄漏,评审 P2)。storeKey 含显示
@@ -605,7 +630,7 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fu
{rows.length === 0 ? (
emptyState
) : (
- <div className="relative w-full" style={{ height: virtualizer.getTotalSize() }}>
+ <div ref={contentLayerRef} className="relative w-full" style={{ height: virtualizer.getTotalSize() }}>
{virtualizer.getVirtualItems().map((vi) => {
const row = rows[vi.index];
if (!row) return null;
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.tsx
index 564de565df..d605dfa84a 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
@@ -324,4 +324,39 @@ describe('globals.css 里的 .tree-hscroll 规则', () => {
);
expect(globalsSrc).toMatch(/::-webkit-scrollbar\s*\{\s*width:\s*12px;\s*\}/);
});
+
+ /**
+ * 评审(纵向滚动拉回横向位置):虚拟化只挂视口内的行,横向范围完全由当前
+ * 挂载行撑出 —— 宽行被回收时范围缩小,浏览器会把 scrollLeft 拉回。内容层
+ * 要保留本树已测得的最大宽(单调不减 minWidth),换树时才重置。
+ */
+ it('回收宽行不缩小横向范围:内容层保留已测得的最大宽,换树才重置', () => {
+ 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:写入粘性 minWidth。
+ rerender(
+ <FileTreeView tree={makeTree()} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,
+ );
+ expect(inner.style.minWidth).toBe('500px');
+
+ // 宽行被回收(后续测得更窄):粘性 minWidth 不缩,横向滚动范围不变小。
+ Object.defineProperty(inner, 'scrollWidth', { configurable: true, value: 200 });
+ rerender(
+ <FileTreeView tree={makeTree()} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,
+ );
+ expect(inner.style.minWidth).toBe('500px');
+
+ // 换树(storeKey 变):粘性宽重置,等新树自己重新测量(先撤掉 stub,让
+ // jsdom 回到真实 scrollWidth=0,验证重置本身)。
+ Reflect.deleteProperty(inner, 'scrollWidth');
+ const switchedTree = { ...makeFarTargetsTree(), storeKey: 'test-store-2', treeIdentityKey: 'test-store-2' };
+ rerender(
+ <FileTreeView tree={switchedTree} scrollScope="tab-1" selectedPath={null} onSelectFile={vi.fn()} />,
+ );
+ expect(inner.style.minWidth).toBe('');
+ });
});