Skip to content

fix: Fix sidebar rename from the ellipsis menu #36

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
NicHaley merged 1 commit into from
Aug 12, 2026
Merged

fix: Fix sidebar rename from the ellipsis menu #36

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
78 changes: 42 additions & 36 deletions apps/dashboard/src/renderer/src/components/project-sidebar/file-tree-node.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,15 @@ export function FileTreeNode({
setRenameError(null);
}

/** Dropdown close returns focus through the trigger; defer so rename isn't cancelled first. */
function handleRenameBlur() {
window.setTimeout(() => {
if (document.activeElement !== inputRef.current) {
cancelRename();
}
}, 0);
}

function handleRenameKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
if (e.key === "Enter") {
e.preventDefault();
Expand All @@ -174,7 +183,7 @@ export function FileTreeNode({
setRenameError(null);
}}
onKeyDown={handleRenameKeyDown}
onBlur={cancelRename}
onBlur={handleRenameBlur}
onClick={(e) => e.stopPropagation()}
className={cn(
"w-full h-5 min-h-5 box-border rounded p-0 text-sm leading-5",
Expand Down Expand Up @@ -392,26 +401,25 @@ export function FileTreeNode({
</ContextMenuTrigger>
<ContextMenuContent>{folderMenuItems}</ContextMenuContent>
</ContextMenu>
{!isRenaming && (
<DropdownMenu>
<DropdownMenuTrigger
render={
<SidebarMenuAction
className={cn(
itemActionClass,
"group-focus-within/folder-row:opacity-100 group-hover/folder-row:opacity-100 aria-expanded:opacity-100 md:opacity-0"
)}
>
<EllipsisIcon />
<span className="sr-only">More actions</span>
</SidebarMenuAction>
}
/>
<DropdownMenuContent side="right" align="start" className="w-auto">
{dropdownFolderMenuItems}
</DropdownMenuContent>
</DropdownMenu>
)}
<DropdownMenu>
<DropdownMenuTrigger
render={
<SidebarMenuAction
className={cn(
itemActionClass,
isRenaming && "hidden",
"group-focus-within/folder-row:opacity-100 group-hover/folder-row:opacity-100 aria-expanded:opacity-100 md:opacity-0"
)}
>
<EllipsisIcon />
<span className="sr-only">More actions</span>
</SidebarMenuAction>
}
/>
<DropdownMenuContent side="right" align="start" className="w-auto">
{dropdownFolderMenuItems}
</DropdownMenuContent>
</DropdownMenu>
</div>
{open && node.children && node.children.length > 0 && (
<SidebarMenuSub className="mr-0 translate-x-0 pr-0">
Expand Down Expand Up @@ -491,21 +499,19 @@ export function FileTreeNode({
</ContextMenuTrigger>
<ContextMenuContent>{menuItems}</ContextMenuContent>
</ContextMenu>
{!isRenaming && (
<DropdownMenu>
<DropdownMenuTrigger
render={
<SidebarMenuAction showOnHover className={itemActionClass}>
<EllipsisIcon />
<span className="sr-only">More actions</span>
</SidebarMenuAction>
}
/>
<DropdownMenuContent side="right" align="start" className="w-auto">
{dropdownMenuItems}
</DropdownMenuContent>
</DropdownMenu>
)}
<DropdownMenu>
<DropdownMenuTrigger
render={
<SidebarMenuAction showOnHover className={cn(itemActionClass, isRenaming && "hidden")}>
<EllipsisIcon />
<span className="sr-only">More actions</span>
</SidebarMenuAction>
}
/>
<DropdownMenuContent side="right" align="start" className="w-auto">
{dropdownMenuItems}
</DropdownMenuContent>
</DropdownMenu>
</SidebarMenuItem>
);
}