From 9e5f332dc6edffbacc6553672e8a75b2bf98da36 Mon Sep 17 00:00:00 2001 From: Enrico Ros Date: Sun, 15 Sep 2024 20:00:01 -0700 Subject: [PATCH] Untangle #596 --- src/apps/chat/components/ChatMessageList.tsx | 2 +- src/apps/chat/components/message/ChatMessage.tsx | 4 ++-- .../message/fragments-content/ContentFragments.tsx | 4 ++-- .../fragments-content/ContentPartText_AutoBlocks.tsx | 4 ++-- src/modules/beam/gather/Fusion.tsx | 2 +- src/modules/beam/scatter/BeamRay.tsx | 2 +- src/modules/blocks/AutoBlocksRenderer.tsx | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/apps/chat/components/ChatMessageList.tsx b/src/apps/chat/components/ChatMessageList.tsx index 0d11ba386..adb51af23 100644 --- a/src/apps/chat/components/ChatMessageList.tsx +++ b/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} diff --git a/src/apps/chat/components/message/ChatMessage.tsx b/src/apps/chat/components/message/ChatMessage.tsx index be1d98b6b..352ec8fbd 100644 --- a/src/apps/chat/components/message/ChatMessage.tsx +++ b/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} diff --git a/src/apps/chat/components/message/fragments-content/ContentFragments.tsx b/src/apps/chat/components/message/fragments-content/ContentFragments.tsx index 1221cfdf1..1e82ddb26 100644 --- a/src/apps/chat/components/message/fragments-content/ContentFragments.tsx +++ b/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} diff --git a/src/apps/chat/components/message/fragments-content/ContentPartText_AutoBlocks.tsx b/src/apps/chat/components/message/fragments-content/ContentPartText_AutoBlocks.tsx index 3fae489e2..8a9edad33 100644 --- a/src/apps/chat/components/message/fragments-content/ContentPartText_AutoBlocks.tsx +++ b/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'} diff --git a/src/modules/beam/gather/Fusion.tsx b/src/modules/beam/gather/Fusion.tsx index d905c4578..6ed50e3a5 100644 --- a/src/modules/beam/gather/Fusion.tsx +++ b/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} /> diff --git a/src/modules/beam/scatter/BeamRay.tsx b/src/modules/beam/scatter/BeamRay.tsx index e48fccf13..abc6e9c8b 100644 --- a/src/modules/beam/scatter/BeamRay.tsx +++ b/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} /> diff --git a/src/modules/blocks/AutoBlocksRenderer.tsx b/src/modules/blocks/AutoBlocksRenderer.tsx index e32384c21..bf8c8401f 100644 --- a/src/modules/blocks/AutoBlocksRenderer.tsx +++ b/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}