@@ -26,6 +26,7 @@ import { serializeComposerFileLink } from "@t3tools/shared/composerTrigger";
2626import { createModelSelection , normalizeModelSlug } from "@t3tools/shared/model" ;
2727import {
2828 memo ,
29+ type ReactNode ,
2930 useCallback ,
3031 useEffect ,
3132 useImperativeHandle ,
@@ -34,6 +35,7 @@ import {
3435 useRef ,
3536 useState ,
3637} from "react" ;
38+ import { createPortal } from "react-dom" ;
3739import {
3840 clampCollapsedComposerCursor ,
3941 type ComposerTrigger ,
@@ -93,6 +95,64 @@ import { buildExpandedImagePreview, type ExpandedImagePreview } from "./Expanded
9395import { basenameOfPath } from "../../pierre-icons" ;
9496import { cn , randomUUID } from "~/lib/utils" ;
9597import { Separator } from "../ui/separator" ;
98+
99+ function ComposerCommandMenuLayer ( props : { anchor : HTMLElement | null ; children : ReactNode } ) {
100+ const [ position , setPosition ] = useState < {
101+ bottom : number ;
102+ left : number ;
103+ maxHeight : number ;
104+ width : number ;
105+ } | null > ( null ) ;
106+
107+ useLayoutEffect ( ( ) => {
108+ const anchor = props . anchor ;
109+ if ( ! anchor ) {
110+ setPosition ( null ) ;
111+ return ;
112+ }
113+
114+ const updatePosition = ( ) => {
115+ const rect = anchor . getBoundingClientRect ( ) ;
116+ setPosition ( {
117+ bottom : window . innerHeight - rect . top + 8 ,
118+ left : rect . left ,
119+ maxHeight : Math . max ( 96 , rect . top - 24 ) ,
120+ width : rect . width ,
121+ } ) ;
122+ } ;
123+
124+ updatePosition ( ) ;
125+ window . addEventListener ( "resize" , updatePosition ) ;
126+ window . addEventListener ( "scroll" , updatePosition , true ) ;
127+
128+ const observer =
129+ typeof ResizeObserver === "undefined" ? null : new ResizeObserver ( updatePosition ) ;
130+ observer ?. observe ( anchor ) ;
131+
132+ return ( ) => {
133+ observer ?. disconnect ( ) ;
134+ window . removeEventListener ( "resize" , updatePosition ) ;
135+ window . removeEventListener ( "scroll" , updatePosition , true ) ;
136+ } ;
137+ } , [ props . anchor ] ) ;
138+
139+ if ( ! position ) return null ;
140+
141+ return createPortal (
142+ < div
143+ className = "pointer-events-auto fixed z-[70]"
144+ style = { {
145+ bottom : position . bottom ,
146+ left : position . left ,
147+ maxHeight : position . maxHeight ,
148+ width : position . width ,
149+ } }
150+ >
151+ { props . children }
152+ </ div > ,
153+ document . body ,
154+ ) ;
155+ }
96156import { Button } from "../ui/button" ;
97157import { Select , SelectItem , SelectPopup , SelectTrigger , SelectValue } from "../ui/select" ;
98158import { Tooltip , TooltipPopup , TooltipTrigger } from "../ui/tooltip" ;
@@ -903,6 +963,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
903963 const [ isComposerPrimaryActionsCompact , setIsComposerPrimaryActionsCompact ] = useState ( false ) ;
904964 const [ isComposerModelPickerOpen , setIsComposerModelPickerOpen ] = useState ( false ) ;
905965 const [ isComposerFocused , setIsComposerFocused ] = useState ( false ) ;
966+ const [ composerMenuAnchor , setComposerMenuAnchor ] = useState < HTMLDivElement | null > ( null ) ;
906967 const isMobileViewport = useMediaQuery ( "max-sm" ) ;
907968 const isComposerCollapsedMobile =
908969 isMobileViewport && ! forceExpandedOnMobile && ! isComposerFocused ;
@@ -2337,14 +2398,15 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
23372398 ) : null }
23382399
23392400 < div
2401+ ref = { setComposerMenuAnchor }
23402402 className = { cn (
23412403 "relative px-3 pb-2 sm:px-4" ,
23422404 hasComposerHeader ? "pt-2.5 sm:pt-3" : "pt-3.5 sm:pt-4" ,
23432405 isComposerCollapsedMobile && "hidden" ,
23442406 ) }
23452407 >
23462408 { composerMenuOpen && ! isComposerApprovalState && (
2347- < div className = "absolute inset-x-0 bottom-full z-20 mb-2" >
2409+ < ComposerCommandMenuLayer anchor = { composerMenuAnchor } >
23482410 < ComposerCommandMenu
23492411 items = { composerMenuItems }
23502412 resolvedTheme = { resolvedTheme }
@@ -2359,7 +2421,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
23592421 onHighlightedItemChange = { onComposerMenuItemHighlighted }
23602422 onSelect = { onSelectComposerItem }
23612423 />
2362- </ div >
2424+ </ ComposerCommandMenuLayer >
23632425 ) }
23642426
23652427 { ! isComposerCollapsedMobile &&
0 commit comments