-
Notifications
You must be signed in to change notification settings - Fork 694
fix(toolbar): fix scrollable file list overflow in ToolbarChangesPanel #1303
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.
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
+67
−27
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,39 +31,41 @@ export const ToolbarChangesPanel = memo(function ToolbarChangesPanelComponent({ | |
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| {stats.files?.map((file) => ( | ||
| <div | ||
| key={file.path} | ||
| className="group/file flex items-center gap-2 px-3 py-1 text-xs hover:bg-muted/50 transition-colors" | ||
| > | ||
| <FileIcon className="size-3 flex-shrink-0 text-muted-foreground" /> | ||
| <span className="flex items-center gap-1 flex-shrink-0 text-[11px]"> | ||
| {file.additions > 0 && ( | ||
| <span className="text-emerald-600 dark:text-emerald-400">+{file.additions}</span> | ||
| <div className="flex flex-col max-h-32"> | ||
| <div className="overflow-y-auto py-1 px-0.5 flex-1 min-h-0"> | ||
| {stats.files?.map((file) => ( | ||
| <div | ||
| key={file.path} | ||
| className="group/file flex items-center gap-2 px-3 py-1 text-xs hover:bg-muted/50 transition-colors" | ||
| > | ||
| <FileIcon className="size-3 flex-shrink-0 text-muted-foreground" /> | ||
| <span className="flex items-center gap-1 flex-shrink-0 text-[11px]"> | ||
| {file.additions > 0 && ( | ||
| <span className="text-emerald-600 dark:text-emerald-400">+{file.additions}</span> | ||
| )} | ||
| {file.deletions > 0 && <span className="text-destructive">-{file.deletions}</span>} | ||
| </span> | ||
| <span className="truncate text-muted-foreground" title={file.path}> | ||
| {file.path} | ||
| </span> | ||
| {workDir && ( | ||
| <div className="flex-shrink-0 hidden lg:block opacity-0 group-hover/file:opacity-100 transition-opacity duration-150"> | ||
| <OpenInButton path={getFilePath(file.path)} /> | ||
| </div> | ||
| )} | ||
| {file.deletions > 0 && <span className="text-destructive">-{file.deletions}</span>} | ||
| </span> | ||
| <span className="truncate text-muted-foreground" title={file.path}> | ||
| {file.path} | ||
| </span> | ||
| {workDir && ( | ||
| <div className="flex-shrink-0 hidden lg:block opacity-0 group-hover/file:opacity-100 transition-opacity duration-150"> | ||
| <OpenInButton path={getFilePath(file.path)} /> | ||
| </div> | ||
| )} | ||
| </div> | ||
| ))} | ||
| </div> | ||
| ))} | ||
| </div> | ||
| {workDir && ( | ||
| <div className="group/folder sticky bottom-0 flex items-center gap-1.5 px-3 py-1.5 text-[11px] border-t bg-muted/40"> | ||
| <div className="group/folder flex items-center gap-1.5 px-3 py-1.5 text-[11px] border-t bg-muted/40 flex-shrink-0"> | ||
| <FolderOpenIcon className="size-3 flex-shrink-0 text-muted-foreground/70" /> | ||
| <span className="truncate text-muted-foreground/70">{workDir}</span> | ||
| <div className="flex-shrink-0 hidden lg:block opacity-0 group-hover/folder:opacity-100 transition-opacity duration-150"> | ||
|
Comment on lines
61
to
63
|
||
| <OpenInButton path={workDir} /> | ||
| </div> | ||
| </div> | ||
| )} | ||
| </> | ||
| </div> | ||
| ); | ||
| }); | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
truncateinside a flex row typically won’t actually truncate unless the truncating element is allowed to shrink (e.g.,min-w-0and oftenflex-1). As written, longfile.pathvalues can still force horizontal overflow rather than ellipsize. Consider addingmin-w-0(andflex-1if you want it to take remaining space) to this span so paths reliably truncate.