From 4bf3e02962412fe0f0a91fd160502d78e44041a9 Mon Sep 17 00:00:00 2001
From: ecwu <bitlabwzh@gmail.com>
Date: Tue, 16 Jul 2024 23:01:18 +0800
Subject: [PATCH] reform the message box with bubble style

---
 src/chatbox.tsx       |   2 +-
 src/logprob.tsx       |   2 +-
 src/message.tsx       | 122 ++++++++++++++++++++++++------------------
 src/messageDetail.tsx |   2 +-
 src/messageHide.tsx   |   4 +-
 src/settings.tsx      |   6 +++
 6 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/src/chatbox.tsx b/src/chatbox.tsx
index d9ad636..2f9a9b1 100644
--- a/src/chatbox.tsx
+++ b/src/chatbox.tsx
@@ -722,7 +722,7 @@ export default function ChatBOX(props: {
           />
         ))}
         {showGenerating && (
-          <p className="p-2 my-2 animate-pulse dark:text-white message-content">
+          <p className="p-2 my-2 animate-pulse message-content">
             {generatingMessage || Tr("Generating...")}
             ...
           </p>
diff --git a/src/logprob.tsx b/src/logprob.tsx
index 5089d3e..2d20404 100644
--- a/src/logprob.tsx
+++ b/src/logprob.tsx
@@ -6,7 +6,7 @@ const logprobToColor = (logprob: number) => {
   // 绿色的RGB值为(0, 255, 0)，红色的RGB值为(255, 0, 0)
   const red = Math.round(255 * (1 - percent / 100));
   const green = Math.round(255 * (percent / 100));
-  const color = `rgb(${red}, ${green}, 0)`;
+  const color = `rgba(${red}, ${green}, 0, 0.5)`;
 
   return color;
 };
diff --git a/src/message.tsx b/src/message.tsx
index 7cb378d..caa2ebe 100644
--- a/src/message.tsx
+++ b/src/message.tsx
@@ -51,17 +51,26 @@ export default function Message(props: Props) {
         setChatStore({ ...chatStore });
       }}
     >
-      🗑️
+      Delete
     </button>
   );
   const CopiedHint = () => (
-    <span
-      className={
-        "bg-purple-400 p-1 rounded shadow-md absolute z-20 left-1/2 top-3/4 transform -translate-x-1/2 -translate-y-1/2"
-      }
-    >
-      {Tr("Message copied to clipboard!")}
-    </span>
+    <div role="alert" class="alert">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        fill="none"
+        viewBox="0 0 24 24"
+        class="stroke-info h-6 w-6 shrink-0"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+        ></path>
+      </svg>
+      <span>{Tr("Message copied to clipboard!")}</span>
+    </div>
   );
 
   const copyToClipboard = (text: string) => {
@@ -78,7 +87,7 @@ export default function Message(props: Props) {
             copyToClipboard(textToCopy);
           }}
         >
-          📋
+          Copy
         </button>
       </>
     );
@@ -105,51 +114,62 @@ export default function Message(props: Props) {
       >
         <div>
           <div
-            className={`w-fit p-2 rounded my-2 ${
-              chat.role === "assistant"
-                ? "bg-white dark:bg-gray-700 dark:text-white"
-                : "bg-green-400"
+            className={`chat min-w-16 w-fit p-2 my-2 ${
+              chat.role === "assistant" ? "chat-start" : "chat-end"
             } ${chat.hide ? "opacity-50" : ""}`}
           >
-            {chat.hide ? (
-              <MessageHide chat={chat} />
-            ) : typeof chat.content !== "string" ? (
-              <MessageDetail chat={chat} renderMarkdown={renderMarkdown} />
-            ) : chat.tool_calls ? (
-              <MessageToolCall chat={chat} copyToClipboard={copyToClipboard} />
-            ) : chat.role === "tool" ? (
-              <MessageToolResp chat={chat} copyToClipboard={copyToClipboard} />
-            ) : renderMarkdown ? (
-              // @ts-ignore
-              <Markdown markdown={getMessageText(chat)} />
-            ) : (
-              <div className="message-content">
-                {
-                  // only show when content is string or list of message
-                  // this check is used to avoid rendering tool call
-                  chat.content &&
-                    (chat.logprobs && renderColor
-                      ? chat.logprobs.content
-                          .filter((c) => c.token)
-                          .map((c) => (
-                            <div
-                              style={{
-                                color: logprobToColor(c.logprob),
-                                display: "inline",
-                              }}
-                            >
-                              {c.token}
-                            </div>
-                          ))
-                      : getMessageText(chat))
-                }
-              </div>
-            )}
-            <hr className="mt-2" />
-            <TTSPlay chat={chat} />
-            <div className="w-full flex justify-between">
+            <div
+              className={`chat-bubble ${
+                chat.role === "assistant"
+                  ? "chat-bubble-secondary"
+                  : "chat-bubble-primary"
+              }`}
+            >
+              {chat.hide ? (
+                <MessageHide chat={chat} />
+              ) : typeof chat.content !== "string" ? (
+                <MessageDetail chat={chat} renderMarkdown={renderMarkdown} />
+              ) : chat.tool_calls ? (
+                <MessageToolCall
+                  chat={chat}
+                  copyToClipboard={copyToClipboard}
+                />
+              ) : chat.role === "tool" ? (
+                <MessageToolResp
+                  chat={chat}
+                  copyToClipboard={copyToClipboard}
+                />
+              ) : renderMarkdown ? (
+                // @ts-ignore
+                <Markdown markdown={getMessageText(chat)} />
+              ) : (
+                <div className="message-content">
+                  {
+                    // only show when content is string or list of message
+                    // this check is used to avoid rendering tool call
+                    chat.content &&
+                      (chat.logprobs && renderColor
+                        ? chat.logprobs.content
+                            .filter((c) => c.token)
+                            .map((c) => (
+                              <div
+                                style={{
+                                  backgroundColor: logprobToColor(c.logprob),
+                                  display: "inline",
+                                }}
+                              >
+                                {c.token}
+                              </div>
+                            ))
+                        : getMessageText(chat))
+                  }
+                </div>
+              )}
+            </div>
+            <div class="chat-footer opacity-50 flex gap-x-2">
+              <TTSPlay chat={chat} />
               <DeleteIcon />
-              <button onClick={() => setShowEdit(true)}>🖋</button>
+              <button onClick={() => setShowEdit(true)}>Edit</button>
               {chatStore.tts_api && chatStore.tts_key && (
                 <TTSButton
                   chatStore={chatStore}
diff --git a/src/messageDetail.tsx b/src/messageDetail.tsx
index 84666e3..4d7aeff 100644
--- a/src/messageDetail.tsx
+++ b/src/messageDetail.tsx
@@ -13,7 +13,7 @@ export function MessageDetail({ chat, renderMarkdown }: Props) {
       {chat.content.map((mdt) =>
         mdt.type === "text" ? (
           chat.hide ? (
-            mdt.text?.split("\n")[0].slice(0, 16) + "... (deleted)"
+            mdt.text?.split("\n")[0].slice(0, 16) + " ..."
           ) : renderMarkdown ? (
             // @ts-ignore
             <Markdown markdown={mdt.text} />
diff --git a/src/messageHide.tsx b/src/messageHide.tsx
index 9e78cb6..cf40095 100644
--- a/src/messageHide.tsx
+++ b/src/messageHide.tsx
@@ -6,7 +6,5 @@ interface Props {
 }
 
 export function MessageHide({ chat }: Props) {
-  return (
-    <div>{getMessageText(chat).split("\n")[0].slice(0, 18)} ... (deleted)</div>
-  );
+  return <div>{getMessageText(chat).split("\n")[0].slice(0, 18)} ...</div>;
 }
diff --git a/src/settings.tsx b/src/settings.tsx
index 299ea24..7a836f0 100644
--- a/src/settings.tsx
+++ b/src/settings.tsx
@@ -491,6 +491,12 @@ export default (props: {
               <select data-choose-theme class="select select-bordered">
                 <option value="light">Light</option>
                 <option value="dark">Dark</option>
+                <option value="cupcake">Cupcake</option>
+                <option value="halloween">Halloween</option>
+                <option value="wireframe">Wireframe</option>
+                <option value="sunset">Sunset</option>
+                <option value="lemonade">Lemonade</option>
+                <option value="luxury">Luxury</option>
                 <option value="cyberpunk">Cyberpunk</option>
                 <option value="black">Black</option>
               </select>