From 26b95e2bd93866156b67990704c81119385f5ed0 Mon Sep 17 00:00:00 2001
From: Jovines <1246634075@qq.com>
Date: Fri, 27 Feb 2026 02:08:08 +0800
Subject: [PATCH] fix(mobile): improve branch selection dropdown interaction in
 merge dialog (#526)

- Add modal={false} to DropdownMenu to prevent drawer closing when
dismissing branch selector without selecting
- Remove auto-focus on search input to prevent unwanted keyboard popup
when opening branch selector on mobile

Co-authored-by: Jovines <jovines@qq.com>
---
 .../src/components/views/git/BranchIntegrationSection.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/ui/src/components/views/git/BranchIntegrationSection.tsx b/packages/ui/src/components/views/git/BranchIntegrationSection.tsx
index 0ab0ede2..93ee0847 100644
--- a/packages/ui/src/components/views/git/BranchIntegrationSection.tsx
+++ b/packages/ui/src/components/views/git/BranchIntegrationSection.tsx
@@ -153,12 +153,6 @@ export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> =
   React.useEffect(() => {
     if (!branchDropdownOpen) {
       setBranchSearch('');
-    } else {
-      // Focus the search input when dropdown opens
-      const timer = setTimeout(() => {
-        searchInputRef.current?.focus();
-      }, 0);
-      return () => clearTimeout(timer);
     }
   }, [branchDropdownOpen]);
 
@@ -288,7 +282,7 @@ export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> =
         <p className="typography-meta text-muted-foreground">
           {operation === 'merge' ? `Branch to merge into ${targetBranchLabel}` : 'Branch to rebase onto'}
         </p>
-        <DropdownMenu open={branchDropdownOpen} onOpenChange={setBranchDropdownOpen}>
+        <DropdownMenu open={branchDropdownOpen} onOpenChange={setBranchDropdownOpen} modal={false}>
           <DropdownMenuTrigger asChild>
             <Button variant="outline" className="w-full justify-between h-10">
               <span className={cn('truncate', !selectedBranch && 'text-muted-foreground')}>