Skip to content

fix(diff): stop diff panel snapping while scrolling #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelessiet merged 1 commit into from
Aug 4, 2026
Merged

fix(diff): stop diff panel snapping while scrolling #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions apps/web/src/components/DiffPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,18 @@ export default function DiffPanel({
const diffFileKeys = useMemo(() => codeViewFiles.map((file) => file.fileKey), [codeViewFiles]);
const allDiffFilesCollapsed = areAllDiffFilesCollapsed(diffFileKeys, collapsedDiffFileKeys);

// The selected file path is sticky in the store, so scroll once per reveal
// request — waiting for the file to appear in a still-loading patch — and
// then leave the viewport alone. Re-scrolling on every file-list identity
// change (collapse toggles, watcher-driven diff refreshes) yanks the view
// away from wherever the user scrolled.
const handledFileRevealRequestRef = useRef(0);
useEffect(() => {
if (!selectedFilePath) return;
if (!selectedFilePath || selectedFileRevealRequestId === 0) return;
if (handledFileRevealRequestRef.current === selectedFileRevealRequestId) return;
const file = codeViewFiles.find((candidate) => candidate.filePath === selectedFilePath);
if (!file) return;
handledFileRevealRequestRef.current = selectedFileRevealRequestId;
codeViewRef.current?.scrollTo({ type: "item", id: file.fileKey, align: "start" });
}, [codeViewFiles, selectedFilePath, selectedFileRevealRequestId]);

Expand Down Expand Up @@ -867,7 +875,7 @@ export default function DiffPanel({
<AnnotatableCodeView
viewerRef={codeViewRef}
key={collapseScopeKey ?? reviewSectionId}
className="diff-render-surface h-full min-h-0 overflow-auto [&>div>div:last-child]:top-0! [&>div>div:last-child]:bottom-auto!"
className="diff-render-surface h-full min-h-0 overflow-auto"
files={codeViewFiles}
sectionId={reviewSectionId}
sectionTitle={reviewSectionTitle}
Expand Down
Loading