Skip to content

fix(diff-view): restore scroll position and fix tab handling on save/deny #589

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
navedmerchant merged 8 commits into from
Jun 18, 2026
Merged

fix(diff-view): restore scroll position and fix tab handling on save/deny #589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c51054c
fix(diff-view): restore scroll position and fix tab handling on save/…
awschmeder Jun 12, 2026
6ea564c
fix(diff-view): restore preview tabs to their original editor group
awschmeder Jun 12, 2026
e6d25d1
Merge branch 'main' of github.com:Zoo-Code-Org/Zoo-Code into fix/diff…
awschmeder Jun 13, 2026
003a31e
feat: keep diff target tab open on user interaction, mirror scroll po…
awschmeder Jun 13, 2026
57fe83d
feat(settings): expose auto-close diff-view tab settings in UI tab
awschmeder Jun 14, 2026
47df99a
Merge branch 'main' into fix/diff-scroll-position
navedmerchant Jun 14, 2026
c790d13
fix(diff-view): fix CI under vitest v4 and address review feedback
navedmerchant Jun 17, 2026
55753b7
Merge branch 'main' into fix/diff-scroll-position
navedmerchant Jun 18, 2026
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
5 changes: 5 additions & 0 deletions .changeset/fix-diff-scroll-position.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"zoo-code": patch
---

@navedmerchant navedmerchant Jun 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to investigate why so many agents create these changeset files lol, I saw it in other PRs too. I think it might be some instruction in the zoo repository

@navedmerchant navedmerchant Jun 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

figured it out, looks like they look at changesets in the repo and assume we need to generate one. We need to add instructions about it in agents.md, or just allow changesets in general

Fix diff view scroll position and tab handling when applying edits. The diff now opens scrolled to the first changed line (including end-of-file removals, which are clamped to a valid line in the modified document) instead of forcing the viewport to the top. After accepting or rejecting a diff, files that were already open are restored to their pre-edit scroll position, and files that were not open before the edit have their transiently opened tab closed -- unless the user activated that tab during the diff, in which case it is kept open. Focus is no longer pulled back to the edited file when the user has navigated elsewhere. A first file that was open in a preview tab is restored in a preview tab with the original scroll position, even if the target file replaced the preview tab and was automatically closed after the diff was accepted or rejected. A file that was pinned before the edit is re-pinned after the diff closes, so applying a diff no longer drops the tab's pinned state.
Loading
Loading