diff --git a/src/components/layout/branch-dropdown.tsx b/src/components/layout/branch-dropdown.tsx index b9ac6a2..61f0a07 100644 --- a/src/components/layout/branch-dropdown.tsx +++ b/src/components/layout/branch-dropdown.tsx @@ -146,7 +146,6 @@ export function BranchDropdown({ const [localOpen, setLocalOpen] = useState(false) const [remoteOpen, setRemoteOpen] = useState(false) const [confirmAction, setConfirmAction] = useState(null) - const [expandedBranch, setExpandedBranch] = useState(null) const [worktreeOpen, setWorktreeOpen] = useState(false) const [worktreeBranchName, setWorktreeBranchName] = useState("") const [worktreePath, setWorktreePath] = useState("") @@ -299,7 +298,6 @@ export function BranchDropdown({ if (!open) { setLocalOpen(false) setRemoteOpen(false) - setExpandedBranch(null) } } @@ -512,27 +510,10 @@ export function BranchDropdown({ } return ( - { - if (!open) setExpandedBranch(null) - }} - > + setExpandedBranch(expandedBranch === b ? null : b)} - onPointerMove={(e) => { - e.preventDefault() - if (expandedBranch !== null && expandedBranch !== b) { - setExpandedBranch(null) - if (document.activeElement instanceof HTMLElement) { - document.activeElement.blur() - } - } - }} - onPointerLeave={(e) => e.preventDefault()} > {label} diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx index 24f083d..c99a978 100644 --- a/src/components/ui/dropdown-menu.tsx +++ b/src/components/ui/dropdown-menu.tsx @@ -243,14 +243,16 @@ function DropdownMenuSubContent({ ...props }: React.ComponentProps) { return ( - + + + ) }