Skip to content

fix(staged): select first file from sidebar order instead of raw git order #717

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
matt2e merged 2 commits into from
May 13, 2026
Merged

fix(staged): select first file from sidebar order instead of raw git order #717

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bafae07
fix(staged): select first file from sidebar order instead of raw git …
matt2e May 12, 2026
2bd9c1b
fix(staged): wait for review state before selecting initial diff file
matt2e May 13, 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
20 changes: 20 additions & 0 deletions apps/staged/src/lib/features/diff/DiffModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@
// Reset review state — the $effect will recreate it once the new commitSha resolves
reviewHandle = null;

// Reset so the sidebar-order effect picks the first file after reload
initialSelectionApplied = false;

// Switch diff context (reloads file list)
try {
await diffViewer.switchContext(newScope, newCommitSha);
Expand Down Expand Up @@ -740,6 +743,23 @@
: [...flattenTreeFiles(needsReviewTree), ...flattenTreeFiles(reviewedTree)]
);

// Once files finish loading, override the initial selection with the first
// file in sidebar order so the viewer and sidebar stay in sync.
// For non-readonly reviews, also wait for reviewedPaths to load so the
// needs-review / reviewed split is accurate before picking the first file.
let initialSelectionApplied = false;
$effect(() => {
if (
!diffViewer.state.loading &&
orderedFiles.length > 0 &&
!initialSelectionApplied &&
(readonly || !reviewHandle || !reviewHandle.state.loading)
) {
initialSelectionApplied = true;
diffViewer.selectFile(orderedFiles[0].path);
}
});

// ==========================================================================
// Sidebar interactions
// ==========================================================================
Expand Down