Merge pull request #50 from Jonghakseo/dev

Dev
Jonghakseo · Mar 14, 2023 · cf0d8b7 · cf0d8b7
2 parents e9dae88 + c8f538a
commit cf0d8b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/pages/content/src/ContentScriptApp/components/messageBox/ResponseMessageBox.tsx b/src/pages/content/src/ContentScriptApp/components/messageBox/ResponseMessageBox.tsx
@@ -152,14 +152,14 @@ const ChatBox = ({
   if (isLastAndResponse) {
     return (
       <AssistantChat>
-        <ChatText>{chat.content.trim()}</ChatText>
+        <ChatText>{chat.content}</ChatText>
       </AssistantChat>
     );
   }
   if (chat.role === "error") {
     return (
       <AssistantChat>
-        <ChatText isError>{chat.content.trim()}</ChatText>
+        <ChatText isError>{chat.content}</ChatText>
       </AssistantChat>
     );
   }
@@ -168,7 +168,7 @@ const ChatBox = ({
     return (
       <ChatCollapse>
         <AssistantChat>
-          <ChatText>{chat.content.trim()}</ChatText>
+          <ChatText>{chat.content}</ChatText>
         </AssistantChat>
       </ChatCollapse>
     );

diff --git a/src/shared/component/ChatText.tsx b/src/shared/component/ChatText.tsx
@@ -13,6 +13,7 @@ export default function ChatText({
   bold,
   padding = 6,
   border = true,
+  children,
   ...restProps
 }: ChatTextProps) {
   return (
@@ -26,6 +27,8 @@ export default function ChatText({
       lineHeight={1.3}
       fontWeight={bold ? "bold" : "normal"}
       {...restProps}
-    />
+    >
+      {typeof children === "string" ? children.trim() : children}
+    </Text>
   );
 }