From 5b425260c923418bead13e729ff1b70a5589129f Mon Sep 17 00:00:00 2001
From: CrescentLeaf <crescentleaf@noreply.codeberg.org>
Date: Sun, 9 Nov 2025 16:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E4=BA=86=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/ui/chat/ChatFragment.tsx        | 2 +-
 client/ui/custom-elements/chat-text.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/ui/chat/ChatFragment.tsx b/client/ui/chat/ChatFragment.tsx
index efabd23..631a9fd 100644
--- a/client/ui/chat/ChatFragment.tsx
+++ b/client/ui/chat/ChatFragment.tsx
@@ -148,7 +148,7 @@ export default function ChatFragment({ target, showReturnButton, onReturnButtonC
 
         const oldest = messagesList[0]
         setMessagesList(returnMsgs.concat(messagesList))
-        setTimeout(() => chatPanelRef.current!.scrollTo({ top: $(`#chat_${target}_message_${oldest.id}`).get(0).offsetTop }), 200)
+        oldest && setTimeout(() => chatPanelRef.current!.scrollTo({ top: $(`#chat_${target}_message_${oldest.id}`).get(0).offsetTop }), 200)
     }
 
     React.useEffect(() => {
diff --git a/client/ui/custom-elements/chat-text.ts b/client/ui/custom-elements/chat-text.ts
index 9f24610..7aeda96 100644
--- a/client/ui/custom-elements/chat-text.ts
+++ b/client/ui/custom-elements/chat-text.ts
@@ -22,6 +22,8 @@ customElements.define('chat-text', class extends HTMLElement {
         this.update()
     }
     update() {
+        if (this.span == null) return
+        
         this.span.textContent = this.textContent
         this.span.style.textDecoration = $(this).attr('underline') ? 'underline' : ''
         this.span.style.fontStyle = $(this).attr('em') ? 'italic' : ''