From bbb2fdbe1992dd9c6ef6c2ad482d915a0ebf71fe Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Fri, 21 Aug 2026 13:13:11 +0300
Subject: [PATCH] fix(chat): keep draft selectors above composer

---
 .../src/components/chat/composer/ui/DraftTargetSelectors.tsx  | 4 ++--
 packages/ui/src/components/ui/select.tsx                      | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/components/chat/composer/ui/DraftTargetSelectors.tsx b/packages/ui/src/components/chat/composer/ui/DraftTargetSelectors.tsx
index cb8c6259..8c44d434 100644
--- a/packages/ui/src/components/chat/composer/ui/DraftTargetSelectors.tsx
+++ b/packages/ui/src/components/chat/composer/ui/DraftTargetSelectors.tsx
@@ -122,7 +122,7 @@ export function DraftTargetSelectors(props: DraftTargetProps) {
                             : <ProjectLabel project={selectedProject} theme={theme} />}
                     </SelectValue>
                 </SelectTrigger>
-                <SelectContent side="top" fitContent>
+                <SelectContent side="top" collisionAvoidance={{ side: 'none' }} fitContent>
                     {projects.map((project) => (
                         <SelectItem key={project.id} value={project.id} className="max-w-[24rem] truncate">
                             <ProjectLabel project={project} theme={theme} />
@@ -144,7 +144,7 @@ export function DraftTargetSelectors(props: DraftTargetProps) {
                             {selectedBranchLabel ?? t('chat.chatInput.branch')}
                         </SelectValue>
                     </SelectTrigger>
-                    <SelectContent side="top" className="w-max min-w-48">
+                    <SelectContent side="top" collisionAvoidance={{ side: 'none' }} className="w-max min-w-48">
                         {projectRootBranchOption ? (
                             <SelectGroup>
                                 <SelectLabel>{t('chat.chatInput.projectRoot')}</SelectLabel>
diff --git a/packages/ui/src/components/ui/select.tsx b/packages/ui/src/components/ui/select.tsx
index 56c067c1..cee5c00f 100644
--- a/packages/ui/src/components/ui/select.tsx
+++ b/packages/ui/src/components/ui/select.tsx
@@ -163,6 +163,7 @@ type SelectContentExtra = {
   sideOffset?: number;
   side?: "top" | "right" | "bottom" | "left";
   align?: "start" | "center" | "end";
+  collisionAvoidance?: React.ComponentProps<typeof BaseSelect.Positioner>["collisionAvoidance"];
 };
 
 function SelectContent({
@@ -174,6 +175,7 @@ function SelectContent({
   sideOffset,
   side,
   align,
+  collisionAvoidance,
   ...props
 }: React.ComponentProps<typeof BaseSelect.Popup> & SelectContentExtra) {
   const portalContext = React.useContext(SelectPortalContext);
@@ -187,6 +189,7 @@ function SelectContent({
         sideOffset={sideOffset}
         side={side}
         align={align}
+        collisionAvoidance={collisionAvoidance}
         className="absolute z-[120] pointer-events-auto"
       >
         <BaseSelect.Popup