@@ -91,6 +91,7 @@ import { ComposerStashBadge } from "./ComposerStashBadge";
9191import { ComposerStashMenu } from "./ComposerStashMenu" ;
9292import { useComposerMenuState } from "./useComposerMenuState" ;
9393import { useComposerFocusState } from "./useComposerFocusState" ;
94+ import { useComposerMultilinePrompt } from "./useComposerMultilinePrompt" ;
9495import {
9596 ComposerTasksBadge ,
9697 ComposerTasksContent ,
@@ -210,6 +211,7 @@ import { ComposerPromptLengthValidation } from "./ComposerPromptLengthValidation
210211import {
211212 createComposerScrollGestureState ,
212213 recordComposerScrollGestureEvent ,
214+ shouldCollapseComposerForScrollKey ,
213215 resetComposerScrollGesture ,
214216 suppressActiveComposerScrollGesture ,
215217} from "./composerScrollGesture" ;
@@ -1112,6 +1114,7 @@ export interface ChatComposerHandle {
11121114 focusAt : ( cursor : number ) => void ;
11131115 /** Expand the desktop composer at the timeline end without taking focus. */
11141116 restoreAfterTimelineReachedEnd : ( ) => void ;
1117+ collapseForTimelineScrollKey : ( key : string ) => void ;
11151118 addDroppedFiles : ( files : File [ ] ) => void ;
11161119 insertTextAtEnd : ( text : string , options ?: { ensureLeadingBoundary ?: boolean } ) => boolean ;
11171120 citeAssistantText : (
@@ -1818,6 +1821,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
18181821 null ,
18191822 ) ;
18201823 const [ composerMenuAnchor , setComposerMenuAnchor ] = useState < HTMLDivElement | null > ( null ) ;
1824+ const hasWrappedPrompt = useComposerMultilinePrompt ( composerMenuAnchor ) ;
1825+ const hasMultilinePrompt = prompt . includes ( "\n" ) || hasWrappedPrompt ;
18211826 const [ isStashMenuOpen , setIsStashMenuOpen ] = useState ( false ) ;
18221827 const [ isTasksDrawerOpen , setIsTasksDrawerOpen ] = useState ( false ) ;
18231828 const [ stashPulse , setStashPulse ] = useState < { key : number ; active : boolean } > ( {
@@ -1827,7 +1832,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
18271832 const { active : panelAnimationsActive , durationMs : panelAnimationDurationMs } =
18281833 usePanelAnimationSettings ( ) ;
18291834 const isComposerCollapsedMobile =
1830- isMobileViewport && ! forceExpandedOnMobile && ! isComposerFocused ;
1835+ isMobileViewport && ! forceExpandedOnMobile && ! isComposerFocused && ! hasMultilinePrompt ;
18311836
18321837 // ------------------------------------------------------------------
18331838 // Refs
@@ -3715,6 +3720,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
37153720 isMobileViewport,
37163721 isScrollCollapsed : isComposerScrollCollapsed ,
37173722 hasExpandedChrome : composerHasExpandedChrome ,
3723+ hasMultilinePrompt,
37183724 timelineOverflows,
37193725 } ) ;
37203726 // The relocated controls live in the context strip whenever the composer is
@@ -3797,6 +3803,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
37973803 const canScrollCollapseComposer =
37983804 canTrackComposerScrollGesture &&
37993805 settings . composerCollapseOnScroll &&
3806+ ! hasMultilinePrompt &&
38003807 ! composerHasExpandedChrome &&
38013808 ! showInlineTasksBadge ;
38023809 // Scrolling only has something to collapse while the composer is expanded,
@@ -4520,6 +4527,22 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
45204527 composerEditorRef . current ?. focusAt ( cursor ) ;
45214528 } ,
45224529 restoreAfterTimelineReachedEnd,
4530+ collapseForTimelineScrollKey : ( key ) => {
4531+ const scrollNode = getTimelineScrollableNode ( ) ;
4532+ if (
4533+ composerScrollCollapseEligibleRef . current &&
4534+ scrollNode &&
4535+ shouldCollapseComposerForScrollKey ( {
4536+ key,
4537+ scrollTop : scrollNode . scrollTop ,
4538+ scrollHeight : scrollNode . scrollHeight ,
4539+ clientHeight : scrollNode . clientHeight ,
4540+ isAtLogicalEnd : isTimelineAtLogicalEnd ( ) ,
4541+ } )
4542+ ) {
4543+ setIsComposerScrollCollapsed ( true ) ;
4544+ }
4545+ } ,
45234546 addDroppedFiles : ( files : File [ ] ) => {
45244547 void addComposerAttachments ( files ) ;
45254548 focusComposer ( ) ;
@@ -4664,6 +4687,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
46644687 planModeUiEnabled ,
46654688 compactThreadContext ,
46664689 restoreAfterTimelineReachedEnd ,
4690+ getTimelineScrollableNode ,
4691+ isTimelineAtLogicalEnd ,
4692+ setIsComposerScrollCollapsed ,
46674693 ] ,
46684694 ) ;
46694695
@@ -5379,7 +5405,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
53795405 className = { cn (
53805406 showMobilePendingAnswerActions && "max-sm:pb-11" ,
53815407 isComposerResting &&
5382- "max-h-8 min-h-8 overflow-hidden whitespace-nowrap ! leading-8" ,
5408+ "max-h-8 min-h-8 overflow-hidden whitespace-pre ! leading-8" ,
53835409 ) }
53845410 placeholderClassName = { cn (
53855411 isComposerResting &&
0 commit comments