@@ -68,11 +68,8 @@ function lockBackgroundScroll(popup: HTMLElement | null) {
6868 } ;
6969}
7070
71- /** What a docked effort column needs from its picker: the model it serves, and a way to close. */
72- export const DockedPickerContext = createContext < { modelLabel : string ; close : ( ) => void } > ( {
73- modelLabel : "" ,
74- close : ( ) => { } ,
75- } ) ;
71+ /** What a docked effort column needs from its picker: the model it serves. */
72+ export const DockedPickerContext = createContext < { modelLabel : string } > ( { modelLabel : "" } ) ;
7673
7774export const ProviderModelPicker = memo ( function ProviderModelPicker ( props : {
7875 environmentId : EnvironmentId | null ;
@@ -107,8 +104,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
107104 /** Composer shortcuts this trigger answers besides the picker's own. */
108105 triggerShortcuts ?: string ;
109106 /**
110- * Docks an effort column beside the list and a footer under both. Picking a model then keeps
111- * the popup open and moves focus to the new model's levels.
107+ * Docks an effort column beside the list and a footer under both. The popup then stays open
108+ * until Escape or an outside press, and picking a model moves focus to its levels.
112109 */
113110 effortColumn ?: ReactNode ;
114111 footer ?: ReactNode ;
@@ -185,13 +182,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
185182 setIsMenuOpen ( false ) ;
186183 return ;
187184 }
188- // The column renders the new model's levels on commit; a model with none closes the popup.
189- // Levels an Ultrathink prompt locks still count, so the note explaining them stays visible.
190- window . requestAnimationFrame ( ( ) => {
191- const hasLevels = popupRef . current ?. querySelector ( "[data-effort-level]" ) != null ;
192- if ( hasLevels ) focusEffort ( "levels" ) ;
193- else setIsMenuOpen ( false ) ;
194- } ) ;
185+ // The column renders the new model's levels on commit.
186+ window . requestAnimationFrame ( ( ) => focusEffort ( "levels" ) ) ;
195187 } ;
196188
197189 const shortcutLabel = props . keybindings
@@ -235,6 +227,12 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
235227 . filter ( Boolean )
236228 . join ( " · " ) ;
237229
230+ const triggerText = props . triggerLabel ?? multipleLabel ?? triggerTitle ;
231+ const triggerTextProps = {
232+ className : "min-w-0 flex-1 overflow-hidden truncate" ,
233+ "data-chat-provider-model-picker-label" : "true" ,
234+ } as const ;
235+
238236 const picker = (
239237 < ModelPickerContent
240238 searchInputRef = { searchInputRef }
@@ -367,19 +365,14 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
367365 />
368366 </ span >
369367 ) : null }
370- < Tooltip >
371- < TooltipTrigger
372- render = {
373- < span
374- className = "min-w-0 flex-1 overflow-hidden truncate"
375- data-chat-provider-model-picker-label = "true"
376- />
377- }
378- >
379- { props . triggerLabel ?? multipleLabel ?? triggerTitle }
380- </ TooltipTrigger >
381- < TooltipPopup side = "top" > { triggerTooltipContent } </ TooltipPopup >
382- </ Tooltip >
368+ { props . isComposerOwned ? (
369+ < span { ...triggerTextProps } > { triggerText } </ span >
370+ ) : (
371+ < Tooltip >
372+ < TooltipTrigger render = { < span { ...triggerTextProps } /> } > { triggerText } </ TooltipTrigger >
373+ < TooltipPopup side = "top" > { triggerTooltipContent } </ TooltipPopup >
374+ </ Tooltip >
375+ ) }
383376 { props . triggerSuffix }
384377 { selectedModel ?. isUnavailable && ! selectedEntries && props . triggerLabel === undefined ? (
385378 < Badge variant = "outline" size = "sm" >
@@ -405,9 +398,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
405398 touchBackdrop
406399 >
407400 { props . effortColumn ? (
408- < DockedPickerContext
409- value = { { modelLabel : triggerTitle , close : ( ) => setIsMenuOpen ( false ) } }
410- >
401+ < DockedPickerContext value = { { modelLabel : triggerTitle } } >
411402 < div className = "flex flex-col" >
412403 < div className = "flex max-h-86.5 max-sm:max-h-none max-sm:flex-col" >
413404 { picker }
0 commit comments