@@ -148,6 +148,7 @@ import { FONT_FAMILIES } from "../../lib/fontFamilies";
148148import { scopedThreadKey } from "../../lib/scopedEntities" ;
149149import { copyTextWithHaptic } from "../../lib/copyTextWithHaptic" ;
150150import { downloadAndShareAttachment } from "../../lib/attachmentDownload" ;
151+ import { splitMarkdownDetails } from "../../lib/markdownDetails" ;
151152import { hasWideMarkdownBlock } from "../../lib/wideMarkdownBlocks" ;
152153import {
153154 SelectableMarkdownText ,
@@ -1186,39 +1187,115 @@ const AssistantMarkdownContent = memo(function AssistantMarkdownContent(props: {
11861187 readonly skills ?: ReadonlyArray < SelectableMarkdownSkill > | undefined ;
11871188} ) {
11881189 const liveMarkdown = useLiveThreadLinkLabels ( props . markdown , props . environmentId ) ;
1189- const segments = useMemo ( ( ) => splitCodexArtifactTemplateMarkdown ( liveMarkdown ) , [ liveMarkdown ] ) ;
11901190 const threadIcons = useThreadChipIcons ( props . environmentId , liveMarkdown ) ;
11911191 const linkHandlers : MarkdownLinkHandlers = {
11921192 ...props . linkHandlers ,
11931193 linkCustomization : ( href ) =>
11941194 withChipIcon ( props . linkHandlers . linkCustomization ?.( href ) , threadIcons . get ( href ) ) ,
11951195 } ;
11961196
1197- return segments . map ( ( segment ) => {
1198- if ( segment . kind === "artifact-template" ) {
1197+ return (
1198+ < AssistantMarkdownBlocks
1199+ markdown = { liveMarkdown }
1200+ markdownStyles = { props . markdownStyles }
1201+ linkHandlers = { linkHandlers }
1202+ onUseArtifactTemplate = { props . onUseArtifactTemplate }
1203+ renderImage = { props . renderImage }
1204+ skills = { props . skills }
1205+ />
1206+ ) ;
1207+ } ) ;
1208+
1209+ // Folds split first, so an artifact card inside a fold stays inside it.
1210+ function AssistantMarkdownBlocks ( props : {
1211+ readonly markdown : string ;
1212+ readonly markdownStyles : MarkdownStyleSet ;
1213+ readonly linkHandlers : MarkdownLinkHandlers ;
1214+ readonly onUseArtifactTemplate ?: ( ( template : CodexArtifactTemplate ) => void ) | undefined ;
1215+ readonly renderImage : MarkdownImageRenderer ;
1216+ readonly skills ?: ReadonlyArray < SelectableMarkdownSkill > | undefined ;
1217+ } ) {
1218+ const blocks = useMemo (
1219+ ( ) =>
1220+ splitMarkdownDetails ( props . markdown ) . map ( ( block ) =>
1221+ block . kind === "details"
1222+ ? block
1223+ : { ...block , segments : splitCodexArtifactTemplateMarkdown ( block . markdown ) } ,
1224+ ) ,
1225+ [ props . markdown ] ,
1226+ ) ;
1227+ return blocks . map ( ( block ) => {
1228+ if ( block . kind === "details" ) {
11991229 return (
1200- < ArtifactTemplateCard
1201- key = { `artifact-template:${ segment . sourceOffset } ` }
1202- template = { segment . template }
1203- onUse = { props . onUseArtifactTemplate }
1204- />
1230+ < MarkdownDetailsFold
1231+ key = { `details:${ block . sourceOffset } ` }
1232+ summary = { block . summary }
1233+ initiallyOpen = { block . open }
1234+ >
1235+ < AssistantMarkdownBlocks { ...props } markdown = { block . body } />
1236+ </ MarkdownDetailsFold >
12051237 ) ;
12061238 }
1207- if ( segment . markdown . trim ( ) . length === 0 ) return null ;
1208-
1209- const markdown = renderCodexInlineDirectivesAsMarkdown ( segment . markdown ) ;
1210- return (
1211- < SelectableMarkdownText
1212- key = { `markdown:${ segment . sourceOffset } ` }
1213- markdown = { markdown }
1214- skills = { props . skills }
1215- textStyle = { props . markdownStyles . nativeTextStyle }
1216- { ...linkHandlers }
1217- renderImage = { props . renderImage }
1218- />
1219- ) ;
1239+ return block . segments . map ( ( segment ) => {
1240+ const offset = block . sourceOffset + segment . sourceOffset ;
1241+ if ( segment . kind === "artifact-template" ) {
1242+ return (
1243+ < ArtifactTemplateCard
1244+ key = { `artifact-template:${ offset } ` }
1245+ template = { segment . template }
1246+ onUse = { props . onUseArtifactTemplate }
1247+ />
1248+ ) ;
1249+ }
1250+ if ( segment . markdown . trim ( ) . length === 0 ) return null ;
1251+ return (
1252+ < SelectableMarkdownText
1253+ key = { `markdown:${ offset } ` }
1254+ markdown = { renderCodexInlineDirectivesAsMarkdown ( segment . markdown ) }
1255+ skills = { props . skills }
1256+ textStyle = { props . markdownStyles . nativeTextStyle }
1257+ { ...props . linkHandlers }
1258+ renderImage = { props . renderImage }
1259+ />
1260+ ) ;
1261+ } ) ;
12201262 } ) ;
1221- } ) ;
1263+ }
1264+
1265+ function MarkdownDetailsFold ( props : {
1266+ readonly summary : string ;
1267+ readonly initiallyOpen : boolean ;
1268+ readonly children : ReactNode ;
1269+ } ) {
1270+ const [ expanded , setExpanded ] = useState ( props . initiallyOpen ) ;
1271+ const iconSubtleColor = useUniwindTheme ( ) [ "--color-icon-subtle" ] ;
1272+ return (
1273+ < View className = "my-2 border-y border-border" >
1274+ < Pressable
1275+ accessibilityRole = "button"
1276+ accessibilityLabel = { props . summary }
1277+ accessibilityState = { { expanded } }
1278+ hitSlop = { 4 }
1279+ className = "min-h-10 flex-row items-center gap-2 py-2"
1280+ onPress = { ( ) => {
1281+ void Haptics . selectionAsync ( ) ;
1282+ setExpanded ( ( value ) => ! value ) ;
1283+ } }
1284+ >
1285+ < ThreadDisclosureChevron
1286+ expanded = { expanded }
1287+ collapsedDirection = "right"
1288+ size = { 12 }
1289+ tintColor = { iconSubtleColor }
1290+ />
1291+ < Text className = "min-w-0 shrink font-t3-medium text-sm text-foreground" >
1292+ { props . summary }
1293+ </ Text >
1294+ </ Pressable >
1295+ { expanded ? < View className = "pb-3 pl-5" > { props . children } </ View > : null }
1296+ </ View >
1297+ ) ;
1298+ }
12221299
12231300function useMarkdownStyles ( ) : MarkdownStyleSets {
12241301 const { appearance } = useAppearancePreferences ( ) ;
0 commit comments