Merge branch 'feat/rever-agent-message' into develop

illacloud · Mar 1, 2024 · 2a5bb6d · 2a5bb6d
2 parents 3313bbd + 8f6cd82
commit 2a5bb6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/apps/builder/src/page/AI/components/MarkdownMessage/index.tsx b/apps/builder/src/page/AI/components/MarkdownMessage/index.tsx
@@ -30,6 +30,7 @@ import {
   markdownMessageStyle,
 } from "@/page/AI/components/MarkdownMessage/style"
 import Code from "./Code"
+import { handleMarkdownLine } from "./utils"
 
 export const MarkdownMessage: FC<MarkdownMessageProps> = (props) => {
   const { children, isOwnMessage } = props
@@ -64,7 +65,6 @@ export const MarkdownMessage: FC<MarkdownMessageProps> = (props) => {
         <Typography>
           <ReactMarkdown
             css={markdownMessageStyle}
-            // disallowedElements={["table", "thead", "tbody", "tr", "th", "td"]}
             remarkPlugins={[remarkGfm, remarkBreaks]}
             components={{
               h1: ({ children }) => <Heading level="h1">{children}</Heading>,
@@ -99,7 +99,7 @@ export const MarkdownMessage: FC<MarkdownMessageProps> = (props) => {
               code: (props) => <Code {...props} />,
             }}
           >
-            {(children ?? "").replaceAll(/(^---\r?\n?)/gm, "\n---\n")}
+            {handleMarkdownLine(children ?? "")}
           </ReactMarkdown>
         </Typography>
       </div>

diff --git a/apps/builder/src/page/AI/components/MarkdownMessage/utils.ts b/apps/builder/src/page/AI/components/MarkdownMessage/utils.ts
@@ -87,3 +87,7 @@ export const getTextValue = (value: unknown): string => {
     return ""
   }
 }
+
+export const handleMarkdownLine = (text: string) => {
+  return text.replace(/((^\n?---)(\n|$))/gm, "\n---\n")
+}