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(file-browser): 新导航取消上一次未完成的横轴对齐(Greptile P2 处置)

Zhang Yunjina1dce9727b64
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 01c01edf3e..776105e07e 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
@@ -223,23 +223,35 @@ function alignRowHorizontally(container: HTMLElement | null, relPath: string): b
const HORIZONTAL_ALIGN_MAX_FRAMES = 120;
/**
- * 逐帧重试,直到目标行进入 DOM 后再对齐横轴。
+ * 逐帧重试,直到目标行进入 DOM 后再对齐横轴,返回取消函数。
*
* 目标行离当前虚拟窗口较远时,要等 smooth 纵向滚动把它带进 overscan 才会挂载 ——
* 「调一次 / 等下一帧 / 等固定 320ms」这种固定时刻的尝试可能全部跑在挂载之前,
* 结果是纵向跳到位、深层长路径仍留在横向视口之外。这里改成挂载驱动:每帧试一次,
* 行一出现就对齐;上限见上(不常驻,不给热路径留后台任务)。
+ *
+ * 取消是必需的:连续两次导航(用户连点两个搜索结果)时旧任务会在旧行稍后挂载时
+ * 改写共享容器的 scrollLeft,把横向视口从最新目标拉回旧行。
*/
-function alignRowHorizontallyWhenMounted(container: HTMLElement | null, relPath: string): void {
- if (!container) return;
+function startRowHorizontalAlign(container: HTMLElement | null, relPath: string): () => void {
+ if (!container) return () => {};
let frames = 0;
+ let cancelled = false;
+ let rafId: number | null = null;
const attempt = (): void => {
+ rafId = null;
+ if (cancelled) return;
if (alignRowHorizontally(container, relPath)) return;
if (frames >= HORIZONTAL_ALIGN_MAX_FRAMES || !container.isConnected) return;
frames += 1;
- requestAnimationFrame(attempt);
+ rafId = requestAnimationFrame(attempt);
};
attempt();
+ return () => {
+ cancelled = true;
+ if (rafId !== null) cancelAnimationFrame(rafId);
+ rafId = null;
+ };
}
export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(function FileTreeView(
@@ -317,6 +329,8 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fu
// scroll 容器 ref —— 虚拟器与滚动锚点都以它为坐标原点。
const containerRef = useRef<HTMLDivElement>(null);
+ // 当前正在等目标行挂载的横轴对齐任务(取消上一次用,见 startRowHorizontalAlign)。
+ const horizontalAlignCancelRef = useRef<(() => void) | null>(null);
// 行内编辑行(新建 / 重命名)必须始终留在虚拟窗口里:输入值存在 InlineTreeRow
// 自己的 state 里、提交靠 blur —— 行被虚拟化回收时元素从 DOM 移除,浏览器不会
@@ -405,12 +419,22 @@ export const FileTreeView = forwardRef<FileTreeViewHandle, FileTreeViewProps>(fu
// 横轴:目标行可能仍停在视口右侧之外(深层缩进 + 长名字把行撑宽),
// 纵向到位后把该行横向也拉进可见区。行是虚拟器按需挂载的(远距离跳跃时
// 要等 smooth 滚动把它带进 overscan),所以逐帧等到它出现再对齐。
- alignRowHorizontallyWhenMounted(containerRef.current, relPath);
+ // 先取消上一次还没完成的导航:否则旧行稍后挂载时会把横向视口拉回去。
+ horizontalAlignCancelRef.current?.();
+ horizontalAlignCancelRef.current = startRowHorizontalAlign(containerRef.current, relPath);
},
}),
[],
);
+ // 卸载时取消还在逐帧等待的对齐任务(不再对已卸载的容器写 scrollLeft)。
+ useEffect(
+ () => () => {
+ horizontalAlignCancelRef.current?.();
+ },
+ [],
+ );
+
// 右键菜单项:按 entry 类型 + 宿主提供了哪些 handler 动态生成。
const menuActions = useMemo<TreeMenuAction[]>(() => {
if (!menu) return [];
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 8a8b2b8894..1b0f3109c3 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
@@ -54,6 +54,46 @@ const deepEntries: DirEntry[] = [
const deeperEntries: DirEntry[] = [
{ name: 'l3', relPath: 'deep/l2/l3', type: 'directory', size: 0, mtimeMs: 4 },
];
+const otherEntries: DirEntry[] = [
+ { name: 'l2', relPath: 'other/l2', type: 'directory', size: 0, mtimeMs: 5 },
+];
+const otherDeeperEntries: DirEntry[] = [
+ { name: 'l3', relPath: 'other/l2/l3', type: 'directory', size: 0, mtimeMs: 6 },
+];
+
+/**
+ * 120 行文件 + deep / other 两棵深目录:目标行(`deep/l2/l3` = 行 122、
+ * `other/l2/l3` = 行 125)都远在 300px 视口(约 10 行 + overscan)之外,
+ * 初始不在 DOM 里 —— 用来覆盖「目标行要靠虚拟滚动才挂载」那条路径。
+ */
+function makeFarTargetsTree(): UseFileTreeReturn {
+ const many: DirEntry[] = Array.from({ length: 120 }, (_, i) => ({
+ name: `f${i}.ts`,
+ relPath: `f${i}.ts`,
+ type: 'file',
+ size: 1,
+ mtimeMs: 0,
+ }));
+ return {
+ entries: new Map([
+ ['', [...many, rootEntries[1], { name: 'other', relPath: 'other', type: 'directory', size: 0, mtimeMs: 5 }]],
+ ['deep', deepEntries],
+ ['deep/l2', deeperEntries],
+ ['other', otherEntries],
+ ['other/l2', otherDeeperEntries],
+ ]),
+ expanded: new Set(['', 'deep', 'deep/l2', 'other', 'other/l2']),
+ loadingPaths: new Set(),
+ initialLoading: false,
+ loadError: null,
+ showIgnoredDirsSupported: true,
+ storeKey: 'test-store',
+ toggleFolder: vi.fn(),
+ collapseAll: vi.fn(),
+ refresh: vi.fn(async () => undefined),
+ expandToPath: vi.fn(async () => undefined),
+ };
+}
function makeTree(): UseFileTreeReturn {
return {
@@ -169,37 +209,11 @@ describe('FileTreeView 横向滚动契约', () => {
it('目标行还没进虚拟窗口时,挂载后仍会把横轴对齐(不依赖固定时刻的尝试)', async () => {
setTestViewportSize(300);
- // 目标行排在 120 个文件之后(行号 122),远超 300px 视口(约 10 行 +
- // overscan),初始根本不在 DOM 里 —— 「调一次 / 下一帧 / 固定 320ms」这类
- // 固定时刻的尝试会全部跑在挂载之前。
- const many: DirEntry[] = Array.from({ length: 120 }, (_, i) => ({
- name: `f${i}.ts`,
- relPath: `f${i}.ts`,
- type: 'file',
- size: 1,
- mtimeMs: 0,
- }));
const ref = createRef<FileTreeViewHandle>();
const { container } = render(
<FileTreeView
ref={ref}
- tree={{
- entries: new Map([
- ['', [...many, rootEntries[1]]],
- ['deep', deepEntries],
- ['deep/l2', deeperEntries],
- ]),
- expanded: new Set(['', 'deep', 'deep/l2']),
- loadingPaths: new Set(),
- initialLoading: false,
- loadError: null,
- showIgnoredDirsSupported: true,
- storeKey: 'test-store',
- toggleFolder: vi.fn(),
- collapseAll: vi.fn(),
- refresh: vi.fn(async () => undefined),
- expandToPath: vi.fn(async () => undefined),
- }}
+ tree={makeFarTargetsTree()}
scrollScope="test-tab"
selectedPath={null}
onSelectFile={vi.fn()}
@@ -224,6 +238,38 @@ describe('FileTreeView 横向滚动契约', () => {
expect(scroll.scrollLeft).toBe(120);
});
+
+ it('连续两次导航时,旧目标挂载不会把横轴从最新目标拉回去', async () => {
+ setTestViewportSize(300);
+ const ref = createRef<FileTreeViewHandle>();
+ const { container } = render(
+ <FileTreeView
+ ref={ref}
+ tree={makeFarTargetsTree()}
+ scrollScope="test-tab"
+ selectedPath={null}
+ onSelectFile={vi.fn()}
+ />,
+ );
+ const scroll = container.firstElementChild as HTMLElement;
+
+ // 用户连点两个搜索结果:两次导航的目标都还没挂载。
+ ref.current?.scrollToPath('deep/l2/l3');
+ ref.current?.scrollToPath('other/l2/l3');
+
+ // 只有旧目标进了视口(新目标还没到)——它的对齐任务必须已经失效。
+ scroll.scrollTop = 122 * 29;
+ fireEvent.scroll(scroll);
+ const staleRow = scroll.querySelector<HTMLElement>('[data-relpath="deep/l2/l3"]');
+ expect(staleRow).toBeTruthy();
+ scroll.getBoundingClientRect = () => rect(0, 200);
+ staleRow!.getBoundingClientRect = () => rect(40, 700);
+
+ await new Promise((resolve) => requestAnimationFrame(() => resolve(null)));
+
+ // 旧任务若没被取消:这里会变成 500(旧行右缘 700 - 容器右缘 200)。
+ expect(scroll.scrollLeft).toBe(0);
+ });
});
describe('globals.css 里的 .tree-hscroll 规则', () => {