Skip to content

fix(desktop): fix file and changes view overflow clipping content #1175

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
Kitenite merged 1 commit into from
Feb 3, 2026
Merged

fix(desktop): fix file and changes view overflow clipping content #1175

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...c/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/ChangesView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export function ChangesView({ onFileOpen, isExpandedView }: ChangesViewProps) {
const prUrl = githubStatus?.pr?.url;

return (
<div className="flex flex-col h-full">
<div className="flex flex-col flex-1 min-h-0">
<ChangesHeader
onRefresh={handleRefresh}
viewMode={fileListViewMode}
Expand Down
34 changes: 18 additions & 16 deletions ...p/src/renderer/screens/main/components/WorkspaceView/RightSidebar/FilesView/FilesView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export function FilesView() {
}

return (
<div className="flex flex-col h-full">
<div className="flex flex-col flex-1 min-h-0">
<FileTreeToolbar
searchTerm={searchTerm}
onSearchChange={setSearchTerm}
Expand All @@ -291,9 +291,10 @@ export function FilesView() {
onToggleHiddenFiles={handleToggleHiddenFiles}
/>

<ContextMenu>
<ContextMenuTrigger asChild className="flex-1 min-h-0">
<div className="flex-1 min-h-0 overflow-auto">
<div className="flex-1 min-h-0 overflow-hidden">
<ContextMenu>
<ContextMenuTrigger asChild className="h-full">
<div className="h-full overflow-auto">
{newItemMode && newItemParentPath === worktreePath && (
<NewItemInput
mode={newItemMode}
Expand Down Expand Up @@ -385,18 +386,19 @@ export function FilesView() {
</div>
)}
</div>
</ContextMenuTrigger>
<ContextMenuContent className="w-48">
<ContextMenuItem onClick={() => handleNewFile(worktreePath)}>
<LuFile className="mr-2 size-4" />
New File
</ContextMenuItem>
<ContextMenuItem onClick={() => handleNewFolder(worktreePath)}>
<LuFolder className="mr-2 size-4" />
New Folder
</ContextMenuItem>
</ContextMenuContent>
</ContextMenu>
</ContextMenuTrigger>
<ContextMenuContent className="w-48">
<ContextMenuItem onClick={() => handleNewFile(worktreePath)}>
<LuFile className="mr-2 size-4" />
New File
</ContextMenuItem>
<ContextMenuItem onClick={() => handleNewFolder(worktreePath)}>
<LuFolder className="mr-2 size-4" />
New Folder
</ContextMenuItem>
</ContextMenuContent>
</ContextMenu>
</div>

<DeleteConfirmDialog
entry={deleteEntry}
Expand Down
Loading