From c8ba9aa2cdfa23032fa0b3be313b11cb341e7f1d Mon Sep 17 00:00:00 2001 From: Innei Date: Mon, 1 Sep 2025 21:39:33 +0800 Subject: [PATCH] chore(ai): remove inappropriate fade-in animation - Added AIMarkdownMessage.old.tsx for legacy markdown rendering. - Introduced AIMarkdownMessage.v2.tsx with optimized streaming capabilities. - Updated AIMessageParts to utilize the new AIMarkdownMessage.v2 component. - Adjusted UserChatMessage and UserMessageParts to reference the appropriate AIMarkdownMessage versions. This update enhances the markdown rendering experience during streaming interactions. Signed-off-by: Innei --- ...nMessage.tsx => AIMarkdownMessage.old.tsx} | 7 ++ .../message/AIMarkdownMessage.v2.tsx | 115 ++++++++++++++++++ .../components/message/AIMessageParts.tsx | 11 +- .../components/message/UserChatMessage.tsx | 18 ++- .../components/message/UserMessageParts.tsx | 2 +- 5 files changed, 137 insertions(+), 16 deletions(-) rename apps/desktop/layer/renderer/src/modules/ai-chat/components/message/{AIMarkdownMessage.tsx => AIMarkdownMessage.old.tsx} (98%) create mode 100644 apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.v2.tsx diff --git a/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.tsx b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.old.tsx similarity index 98% rename from apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.tsx rename to apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.old.tsx index 668f57d12..cc7b9168b 100644 --- a/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.tsx +++ b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.old.tsx @@ -1,3 +1,7 @@ +/** + * This AI Markdown Message use a optimize tokenization algorithm to render the streaming text. + * But tokenization put into the server response, so we can disable it. + */ import type { LinkProps } from "@follow/components/ui/link/LinkWithTooltip.js" import { parseMarkdown } from "@follow/components/utils/parse-markdown.js" import { cn, isBizId } from "@follow/utils" @@ -334,6 +338,9 @@ const useThrottledMarkdownParsing = (text: string, isProcessing: boolean) => { }, [text, isProcessing, parseWithCache]) } +/** + * @deprecated + */ export const AIMarkdownStreamingMessage = memo( ({ text, diff --git a/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.v2.tsx b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.v2.tsx new file mode 100644 index 000000000..9f171c2f1 --- /dev/null +++ b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMarkdownMessage.v2.tsx @@ -0,0 +1,115 @@ +import type { LinkProps } from "@follow/components/ui/link/LinkWithTooltip.js" +import { parseMarkdown } from "@follow/components/utils/parse-markdown.js" +import { cn, isBizId } from "@follow/utils" +import { createElement, isValidElement, memo, useMemo } from "react" + +import { MemoizedShikiCode } from "~/components/ui/code-highlighter" +import { MarkdownLink } from "~/components/ui/markdown/renderers/MarkdownLink" +import { usePeekModal } from "~/hooks/biz/usePeekModal" + +export const AIMarkdownStreamingMessage = memo( + ({ text, className: classNameProp }: { text: string; className?: string }) => { + const className = `prose max-w-full dark:prose-invert text-sm + prose-h1:text-2xl prose-h2:text-xl prose-h3:text-lg prose-h4:text-base prose-h5:text-base prose-h6:text-sm + prose-li:list-disc prose-li:marker:text-accent prose-hr:border-border prose-hr:mx-8` + + const parsedContent = useMemo(() => baseAIMarkdownParser(text), [text]) + + return
{parsedContent}
+ }, +) + +const RelatedEntryLink = (props: LinkProps) => { + const { href, children } = props + const entryId = isBizId(href) ? href : null + + const peekModal = usePeekModal() + if (!entryId) { + return + } + return ( + + ) +} + +function baseAIMarkdownParser(content: string) { + return parseMarkdown(content, { + components: { + pre: ({ children }) => { + const props = isValidElement(children) && "props" in children && children.props + + if (props) { + const { className, children } = props as any + + if (className && className.includes("language-") && typeof children === "string") { + const language = className.replace("language-", "") + const code = children + + return + } + } + + return
{children}
+ }, + a: ({ node, ...props }) => { + return createElement(RelatedEntryLink, { ...props } as any) + }, + table: ({ children, ref, node, ...props }) => { + return ( +
+ + {children} +
+
+ ) + }, + thead: ({ children, ref, node, ...props }) => { + return ( + + {children} + + ) + }, + th: ({ children, ref, node, ...props }) => { + return ( + + {children} + + ) + }, + tbody: ({ children, ref, node, ...props }) => { + return ( + + {children} + + ) + }, + tr: ({ children, ref, node, ...props }) => { + return ( + + {children} + + ) + }, + td: ({ children, ref, node, ...props }) => { + return ( + + {children} + + ) + }, + }, + }).content +} diff --git a/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMessageParts.tsx b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMessageParts.tsx index a6d5ec595..808caa93b 100644 --- a/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMessageParts.tsx +++ b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/AIMessageParts.tsx @@ -19,7 +19,7 @@ import { AIDisplaySubscriptionsPart, AIReasoningPart, } from "../displays" -import { AIMarkdownStreamingMessage } from "./AIMarkdownMessage" +import { AIMarkdownStreamingMessage } from "./AIMarkdownMessage.v2" import { ToolInvocationComponent } from "./ToolInvocationComponent" const LazyAIDisplayFlowPart = React.lazy(() => @@ -36,14 +36,7 @@ export const AIMessageParts: React.FC = React.memo(({ messa switch (part.type) { case "text": { - return ( - - ) + return } case "reasoning": { diff --git a/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/UserChatMessage.tsx b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/UserChatMessage.tsx index 45dd6e6e6..277eb70db 100644 --- a/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/UserChatMessage.tsx +++ b/apps/desktop/layer/renderer/src/modules/ai-chat/components/message/UserChatMessage.tsx @@ -5,7 +5,7 @@ import { AnimatePresence, m } from "motion/react" import * as React from "react" import { useEditingMessageId, useSetEditingMessageId } from "~/modules/ai-chat/atoms/session" -import { useChatActions } from "~/modules/ai-chat/store/hooks" +import { useChatActions, useChatStatus } from "~/modules/ai-chat/store/hooks" import type { AIChatContextBlock, BizUIMessage } from "~/modules/ai-chat/store/types" import type { RichTextPart } from "../../types/ChatSession" @@ -29,6 +29,8 @@ export const UserChatMessage: React.FC = React.memo(({ mes const editingMessageId = useEditingMessageId() const setEditingMessageId = useSetEditingMessageId() + const chatStatus = useChatStatus() + const isStreaming = chatStatus === "submitted" || chatStatus === "streaming" const isEditing = editingMessageId === messageId // Extract data-block parts for separate rendering @@ -115,11 +117,15 @@ export const UserChatMessage: React.FC = React.memo(({ mes {/* Main chat message */}