Merge pull request #9 from heimoshuiyu/master

Sync Progress

.github/workflows/pages.yml

@@ -29,10 +29,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 22.x
           cache: 'npm'
       - run: npm install
       - run: npm run build

package.json

@@ -38,8 +38,8 @@
     "@radix-ui/react-toggle": "^1.1.1",
     "@radix-ui/react-toggle-group": "^1.1.1",
     "@radix-ui/react-tooltip": "^1.1.6",
-    "@types/react": "^19.0.2",
+    "@types/react": "^18.0.0",
-    "@types/react-dom": "^19.0.2",
+    "@types/react-dom": "^18.0.0",
     "@types/ungap__structured-clone": "^1.2.0",
     "@ungap/structured-clone": "^1.2.1",
     "class-variance-authority": "^0.7.1",
@@ -51,9 +51,9 @@
     "input-otp": "^1.4.1",
     "lucide-react": "^0.469.0",
     "next-themes": "^0.4.4",
-    "react": "^19.0.0",
+    "react": "^18.0.0",
     "react-day-picker": "9.4.4",
-    "react-dom": "^19.0.0",
+    "react-dom": "^18.0.0",
     "react-hook-form": "^7.54.2",
     "react-markdown": "^9.0.1",
     "react-resizable-panels": "^2.1.7",

src/components/ui/navigation-menu.tsx

@@ -30,7 +30,7 @@ const NavigationMenuList = React.forwardRef<
   <NavigationMenuPrimitive.List
     ref={ref}
     className={cn(
-      "group flex flex-1 list-none items-center justify-center space-x-1",
+      "group flex flex-1 flex-wrap list-none items-center justify-center space-x-1",
       className
     )}
     {...props}

src/message.tsx

@@ -155,9 +155,7 @@ export default function Message(props: { messageIndex: number }) {
           ) : chat.role === "tool" ? (
             <MessageToolResp chat={chat} copyToClipboard={copyToClipboard} />
           ) : renderMarkdown ? (
-            // [TODO] It is happening https://github.com/remarkjs/react-markdown/pull/879
+            <Markdown>{getMessageText(chat)}</Markdown>
-            // <Markdown>{getMessageText(chat)}</Markdown>
-            <></>
           ) : (
             <div className="message-content">
               {chat.content &&

src/messageDetail.tsx

@@ -1,4 +1,5 @@
 import { ChatStoreMessage } from "@/types/chatstore";
+import Markdown from "react-markdown";
 
 interface Props {
   chat: ChatStoreMessage;
@@ -15,8 +16,7 @@ export function MessageDetail({ chat, renderMarkdown }: Props) {
           chat.hide ? (
             mdt.text?.split("\n")[0].slice(0, 16) + " ..."
           ) : renderMarkdown ? (
-            // @ts-ignore
+            <Markdown>{mdt.text}</Markdown>
-            <Markdown markdown={mdt.text} />
           ) : (
             mdt.text
           )

src/pages/Chatbox.tsx

@@ -649,7 +649,8 @@ export default function ChatBOX() {
             ))}
           </div>
         )}
-
+      </div>
+      <div className="sticky bottom-0 w-full z-20 bg-background">
         {generatingMessage && (
           <div className="flex items-center justify-end gap-2 p-2 m-2 rounded bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
             <label className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
@@ -662,8 +663,6 @@ export default function ChatBOX() {
             />
           </div>
         )}
-      </div>
-      <div className="sticky bottom-0 w-full z-20 bg-background">
         <form className="relative rounded-lg border bg-background focus-within:ring-1 focus-within:ring-ring p-1">
           <ChatInput
             value={inputMsg}