fix: subscribe persisted store to prevent reused instances from sharing state for FileListMode #11752
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ng state for FileListMode
|
@nshcr is attempting to deploy a commit to the GitButler Team on Vercel. A member of the Team first needs to authorize it. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a state-sharing bug where the file list view mode (tree/list) for branches was incorrectly shared across all branches. Previously, the persisted store instance was created once and never updated when switching branches, causing all branches to use the first branch's list mode state.
The fix uses $derived to reactively get the correct persisted store instance when persistId changes, and subscribes to it in an $effect with proper cleanup handling.
Contributor
|
Looks good to me, nice job spotting that 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Screen.Recording.2026-01-09.at.13.13.21.mov
This PR fixes a bug I mentioned in that issue (#11746) but didn't explain in detail.
In the branch tab, the persisted list mode state of the changed file preview for the selected branch did not correctly respond to branch switching, causing all branches to share the list mode state of the first selected branch (from the initial component initialization).
This is addressed by subscribing to the persisted store within the FileListMode component, ensuring that each branch maintains its own list mode state without affecting the others.
Although my proposal in that issue was to share state, I also believe that the state sharing fixed by this PR was clearly a bug. In this case, using isolated state aligns with the current expected behavior.