Untangle #596

src/apps/chat/components/ChatMessageList.tsx

@@ -314,7 +314,7 @@ export function ChatMessageList(props: {
               isImagining={isImagining}
               isSpeaking={isSpeaking}
               showAntPromptCaching={props.chatLLMAntPromptCaching}
-              showUnsafeHtml={danger_experimentalHtmlWebUi}
+              showUnsafeHtmlCode={danger_experimentalHtmlWebUi}
               onAddInReferenceTo={!composerCanAddInReferenceTo ? undefined : handleAddInReferenceTo}
               onMessageAssistantFrom={handleMessageAssistantFrom}
               onMessageBeam={handleMessageBeam}

src/apps/chat/components/message/ChatMessage.tsx

@@ -137,7 +137,7 @@ export function ChatMessage(props: {
   hideAvatar?: boolean,
   showAntPromptCaching?: boolean,
   showBlocksDate?: boolean,
-  showUnsafeHtml?: boolean,
+  showUnsafeHtmlCode?: boolean,
   adjustContentScaling?: number,
   topDecorator?: React.ReactNode,
   onAddInReferenceTo?: (item: DMetaReferenceItem) => void,
@@ -680,7 +680,7 @@ export function ChatMessage(props: {
             messageRole={messageRole}
             optiAllowSubBlocksMemo={!!messagePendingIncomplete}
             disableMarkdownText={disableMarkdown || fromUser /* User messages are edited as text. Try to have them in plain text. NOTE: This may bite. */}
-            showUnsafeHtml={props.showUnsafeHtml}
+            showUnsafeHtmlCode={props.showUnsafeHtmlCode}
             enhanceCodeBlocks={labsEnhanceCodeBlocks}
 
             textEditsState={textContentEditState}

src/apps/chat/components/message/fragments-content/ContentFragments.tsx

@@ -50,7 +50,7 @@ export function ContentFragments(props: {
   optiAllowSubBlocksMemo?: boolean,
   disableMarkdownText: boolean,
   enhanceCodeBlocks: boolean,
-  showUnsafeHtml?: boolean,
+  showUnsafeHtmlCode?: boolean,
 
   textEditsState: ChatMessageTextPartEditState | null,
   setEditedText: (fragmentId: DMessageFragmentId, value: string) => void,
@@ -176,7 +176,7 @@ export function ContentFragments(props: {
               disableMarkdownText={props.disableMarkdownText}
               enhanceCodeBlocks={props.enhanceCodeBlocks}
               // renderTextDiff={textDiffs || undefined}
-              showUnsafeHtml={props.showUnsafeHtml}
+              showUnsafeHtmlCode={props.showUnsafeHtmlCode}
               optiAllowSubBlocksMemo={!!props.optiAllowSubBlocksMemo}
               onContextMenu={props.onContextMenu}
               onDoubleClick={props.onDoubleClick}

src/apps/chat/components/message/fragments-content/ContentPartText_AutoBlocks.tsx

@@ -26,7 +26,7 @@ export function ContentPartText_AutoBlocks(props: {
   enhanceCodeBlocks: boolean,
   renderTextDiff?: TextDiff[];
 
-  showUnsafeHtml?: boolean,
+  showUnsafeHtmlCode?: boolean,
   optiAllowSubBlocksMemo: boolean,
 
   onContextMenu?: (event: React.MouseEvent) => void;
@@ -59,7 +59,7 @@ export function ContentPartText_AutoBlocks(props: {
       contentScaling={props.contentScaling}
       fitScreen={props.fitScreen}
       isMobile={props.isMobile}
-      showUnsafeHtml={props.showUnsafeHtml}
+      showUnsafeHtmlCode={props.showUnsafeHtmlCode}
       renderSanityTextDiffs={props.renderTextDiff}
       codeRenderVariant={props.enhanceCodeBlocks ? 'enhanced' : 'outlined'}
       textRenderVariant={props.disableMarkdownText ? 'text' : 'markdown'}

src/modules/beam/gather/Fusion.tsx

@@ -148,7 +148,7 @@ export function Fusion(props: {
               fitScreen={true}
               isMobile={props.isMobile}
               hideAvatar
-              showUnsafeHtml={true}
+              showUnsafeHtmlCode={true}
               adjustContentScaling={-1}
               sx={!cardScrolling ? beamCardMessageSx : beamCardMessageScrollingSx}
             />

src/modules/beam/scatter/BeamRay.tsx

@@ -209,7 +209,7 @@ export function BeamRay(props: {
               fitScreen={true}
               isMobile={props.isMobile}
               hideAvatar
-              showUnsafeHtml={true}
+              showUnsafeHtmlCode={true}
               adjustContentScaling={-1}
               sx={!cardScrolling ? beamCardMessageSx : beamCardMessageScrollingSx}
             />

src/modules/blocks/AutoBlocksRenderer.tsx

@@ -40,7 +40,7 @@ export function AutoBlocksRenderer(props: {
 
   showAsDanger?: boolean;
   showAsItalic?: boolean;
-  showUnsafeHtml?: boolean;
+  showUnsafeHtmlCode?: boolean;
 
   renderAsCodeWithTitle?: string;
   renderSanityTextDiffs?: SanityTextDiff[];
@@ -123,7 +123,7 @@ export function AutoBlocksRenderer(props: {
                 contentScaling={props.contentScaling}
                 fitScreen={props.fitScreen}
                 isMobile={props.isMobile}
-                initialShowHTML={props.showUnsafeHtml}
+                initialShowHTML={props.showUnsafeHtmlCode}
                 noCopyButton={props.blocksProcessor === 'diagram'}
                 optimizeLightweight={optimizeMemoBeforeLastBlock}
                 codeSx={scaledCodeSx}
@@ -134,7 +134,7 @@ export function AutoBlocksRenderer(props: {
                 semiStableId={bkInput.bkId}
                 code={bkInput.code} title={bkInput.title} isPartial={bkInput.isPartial}
                 fitScreen={props.fitScreen}
-                initialShowHTML={props.showUnsafeHtml}
+                initialShowHTML={props.showUnsafeHtmlCode /* && !bkInput.isPartial NOTE: with this, it would be only auto-rendered at the end, preventing broken renders */}
                 noCopyButton={props.blocksProcessor === 'diagram'}
                 optimizeLightweight={optimizeMemoBeforeLastBlock}
                 sx={scaledCodeSx}