@@ -87,6 +87,7 @@ import {
8787} from "../../promptStashStore" ;
8888import { ComposerStashBadge } from "./ComposerStashBadge" ;
8989import { ComposerStashMenu } from "./ComposerStashMenu" ;
90+ import { useComposerMenuState } from "./useComposerMenuState" ;
9091import {
9192 ComposerTasksBadge ,
9293 ComposerTasksContent ,
@@ -908,10 +909,12 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
908909 interactionMode : ProviderInteractionMode ;
909910 runtimeMode : RuntimeMode ;
910911 size ?: "sm" | "xs" ;
912+ hidden ?: boolean ;
911913 onToggleInteractionMode : ( ) => void ;
912914 onRuntimeModeChange : ( mode : RuntimeMode ) => void ;
913915} ) {
914916 const size = props . size ?? "sm" ;
917+ const [ open , setOpen ] = useComposerMenuState ( props . hidden ) ;
915918 const runtimeModeOption = runtimeModeConfig [ props . runtimeMode ] ;
916919 const RuntimeModeIcon = runtimeModeOption . icon ;
917920 const interactionModeTooltip =
@@ -969,6 +972,8 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
969972
970973 < Tooltip >
971974 < Select
975+ open = { open }
976+ onOpenChange = { setOpen }
972977 value = { props . runtimeMode }
973978 onValueChange = { ( value ) => props . onRuntimeModeChange ( value ! ) }
974979 >
@@ -2070,10 +2075,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
20702075 isComposerOwned : true ,
20712076 } satisfies Parameters < typeof renderProviderTraitsPicker > [ 0 ] ;
20722077 const providerTraitsPicker = renderProviderTraitsPicker ( providerTraitsPickerInput ) ;
2073- const restingProviderTraitsPicker = renderProviderTraitsPicker ( {
2074- ...providerTraitsPickerInput ,
2075- size : "xs" ,
2076- } ) ;
20772078 const {
20782079 controlsRef : restingComposerControlsRef ,
20792080 hiddenBlockCount : restingControlsHiddenBlockCount ,
@@ -3558,6 +3559,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
35583559 // to see or change the model without expanding the composer.
35593560 const composerControlsInStrip = isComposerResting || isComposerCollapsedMobile ;
35603561 const composerControlsVisibleInStrip = composerControlsInStrip && restingControlsVisible ;
3562+ const composerControlsHidden = composerControlsInStrip && ! restingControlsVisible ;
3563+ if ( composerControlsHidden && isComposerModelPickerOpen ) {
3564+ setIsComposerModelPickerOpen ( false ) ;
3565+ }
35613566 useLayoutEffect ( ( ) => {
35623567 onRestingControlsVisibilityChange ( composerControlsVisibleInStrip ) ;
35633568 } , [ composerControlsVisibleInStrip , onRestingControlsVisibilityChange ] ) ;
@@ -3728,6 +3733,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
37283733
37293734 const restingHiddenBlockCount = composerControlsInStrip ? restingControlsHiddenBlockCount : 0 ;
37303735 const composerControlsCompact = ! composerControlsInStrip && isComposerFooterCompact ;
3736+ const restingProviderTraitsPicker = renderProviderTraitsPicker ( {
3737+ ...providerTraitsPickerInput ,
3738+ size : "xs" ,
3739+ hidden : composerControlsHidden || restingHiddenBlockCount > 1 ,
3740+ } ) ;
37313741 const restingBlockDefs = [
37323742 ...( providerTraitsPicker
37333743 ? [
@@ -3750,6 +3760,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
37503760 interactionMode = { interactionMode }
37513761 runtimeMode = { runtimeMode }
37523762 size = { composerControlsInStrip ? "xs" : "sm" }
3763+ hidden = { composerControlsHidden || restingHiddenBlockCount > 0 }
37533764 onToggleInteractionMode = { toggleInteractionMode }
37543765 onRuntimeModeChange = { handleRuntimeModeChange }
37553766 />
@@ -3868,7 +3879,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
38683879 interactionMode = { interactionMode }
38693880 runtimeMode = { runtimeMode }
38703881 size = "xs"
3871- hidden = { hiddenRestingBlockIds . length === 0 }
3882+ hidden = { composerControlsHidden || hiddenRestingBlockIds . length === 0 }
38723883 showInteractionModeToggle = {
38733884 planModeUiEnabled && hiddenRestingBlockIds . includes ( "mode" )
38743885 }
@@ -4418,6 +4429,18 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
44184429 // ------------------------------------------------------------------
44194430 // Imperative handle
44204431 // ------------------------------------------------------------------
4432+ const openModelPicker = useCallback ( ( ) => {
4433+ if ( composerControlsHidden ) {
4434+ if ( composerBlurFrameRef . current !== null ) {
4435+ window . cancelAnimationFrame ( composerBlurFrameRef . current ) ;
4436+ composerBlurFrameRef . current = null ;
4437+ }
4438+ setIsComposerScrollCollapsed ( false ) ;
4439+ setIsComposerFocused ( true ) ;
4440+ }
4441+ setIsComposerModelPickerOpen ( true ) ;
4442+ } , [ composerControlsHidden ] ) ;
4443+
44214444 useImperativeHandle (
44224445 composerRef ,
44234446 ( ) => ( {
@@ -4441,11 +4464,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
44414464 "cursor" ,
44424465 { ensureLeadingBoundary : true , citationCommentAnchor : sourceAnchor } ,
44434466 ) ,
4444- openModelPicker : ( ) => {
4445- setIsComposerModelPickerOpen ( true ) ;
4446- } ,
4467+ openModelPicker,
44474468 toggleModelPicker : ( ) => {
4448- setIsComposerModelPickerOpen ( ( open ) => ! open ) ;
4469+ if ( isComposerModelPickerOpen ) {
4470+ setIsComposerModelPickerOpen ( false ) ;
4471+ } else {
4472+ openModelPicker ( ) ;
4473+ }
44494474 } ,
44504475 compactContext : compactThreadContext ,
44514476 isModelPickerOpen : ( ) => isComposerModelPickerOpen ,
@@ -4558,6 +4583,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
45584583 projectSelectionRequired ,
45594584 applyPromptReplacement ,
45604585 isComposerModelPickerOpen ,
4586+ openModelPicker ,
45614587 readComposerSnapshot ,
45624588 selectedModel ,
45634589 selectedModelOptionsForDispatch ,
0 commit comments