@@ -57,7 +57,6 @@ import { MessageCopyButton } from "./MessageCopyButton";
5757import { promptLinkFor } from "../promptLinks/copyPromptLink" ;
5858import { PierreEntryIcon } from "./PierreEntryIcon" ;
5959import { formatBytes } from "../../lib/formatBytes" ;
60- import { shouldCollapseUserMessage } from "./MessagesTimeline.logic" ;
6160import { Tooltip , TooltipPopup , TooltipTrigger } from "../ui/tooltip" ;
6261import {
6362 asKnownContextRecord ,
@@ -80,6 +79,7 @@ import { markdownProseDirection } from "~/textDirection";
8079import { useMediaQuery } from "~/hooks/useMediaQuery" ;
8180import { formatChatTimestampTooltip , formatDayAwareTimestamp } from "../../timestampFormat" ;
8281import { WorkflowOpeningBlock } from "./WorkflowOpeningBlock" ;
82+ import { FOLDED_HEIGHT_REM , useTallEnoughToFold } from "./useTallEnoughToFold" ;
8383import { TimelineRowCtx , TimelineRowActivityCtx , type TimelineRow } from "./timelineRowContext" ;
8484import {
8585 MESSAGE_HEADING_LEVEL ,
@@ -1130,8 +1130,9 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop
11301130 const revealForFind = ( ) => setExpanded ( true ) ;
11311131 const revealRef = findRevealRef ( revealForFind ) ;
11321132 const hasVisibleBody = props . text . trim ( ) . length > 0 ;
1133- const canCollapse =
1134- props . collapsible !== false && hasVisibleBody && shouldCollapseUserMessage ( props . text ) ;
1133+ const { ref : contentRef , tallEnough : canCollapse } = useTallEnoughToFold (
1134+ props . collapsible !== false && hasVisibleBody ,
1135+ ) ;
11351136 const isCollapsed = canCollapse && ! expanded ;
11361137 const showCollapseControl = canCollapse ;
11371138
@@ -1140,7 +1141,7 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop
11401141 { hasVisibleBody ? (
11411142 < div
11421143 ref = { revealRef }
1143- className = { cn ( "relative" , isCollapsed && "max-h-44 overflow-hidden" ) }
1144+ className = { cn ( "relative" , isCollapsed && "overflow-hidden" ) }
11441145 data-user-message-body = "true"
11451146 data-thread-find-text = "true"
11461147 data-thread-find-fold = { isCollapsed ? "" : undefined }
@@ -1150,18 +1151,21 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop
11501151 style = {
11511152 isCollapsed
11521153 ? {
1154+ maxHeight : `${ FOLDED_HEIGHT_REM } rem` ,
11531155 WebkitMaskImage : COLLAPSED_USER_MESSAGE_FADE_MASK ,
11541156 maskImage : COLLAPSED_USER_MESSAGE_FADE_MASK ,
11551157 }
11561158 : undefined
11571159 }
11581160 >
1159- < UserMessageBody
1160- text = { props . text }
1161- renderContextReference = { props . renderContextReference }
1162- skills = { props . skills }
1163- markdownCwd = { props . markdownCwd }
1164- />
1161+ < div ref = { contentRef } >
1162+ < UserMessageBody
1163+ text = { props . text }
1164+ renderContextReference = { props . renderContextReference }
1165+ skills = { props . skills }
1166+ markdownCwd = { props . markdownCwd }
1167+ />
1168+ </ div >
11651169 </ div >
11661170 ) : null }
11671171 { showCollapseControl ? (
0 commit comments