From fd3e6d67e1b22c28dc9c2fd6b936a468ac34b542 Mon Sep 17 00:00:00 2001
From: yyhhyyyyyy <yyhhyyyyyy8@gmail.com>
Date: Tue, 29 Jul 2025 22:22:40 +0800
Subject: [PATCH 1/2] fix: improve chat auto-scroll detection with
 IntersectionObserver

---
 src/renderer/src/components/ChatView.vue      |  9 +---
 .../src/components/message/MessageList.vue    | 43 ++++++++++++++-----
 src/types/i18n.d.ts                           | 42 +++++++++---------
 3 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/src/renderer/src/components/ChatView.vue b/src/renderer/src/components/ChatView.vue
index 9f50548ed..8fe7334ac 100644
--- a/src/renderer/src/components/ChatView.vue
+++ b/src/renderer/src/components/ChatView.vue
@@ -45,16 +45,9 @@ const isGenerating = computed(() => {
   return chatStore.generatingThreadIds.has(chatStore.getActiveThreadId()!)
 })
 const handleSend = async (msg: UserMessageContent) => {
-  if (messageList.value) {
-    // 在发送消息前将aboveThreshold设置为false，确保消息发送过程中总是滚动到底部
-    messageList.value.aboveThreshold = false
-  }
   scrollToBottom()
   await chatStore.sendMessage(msg)
-  // 只有当用户在底部时才自动滚动
-  if (!messageList.value?.aboveThreshold) {
-    scrollToBottom()
-  }
+  scrollToBottom()
 }
 
 const handleFileUpload = () => {
diff --git a/src/renderer/src/components/message/MessageList.vue b/src/renderer/src/components/message/MessageList.vue
index fd1ff737e..42b14bf3d 100644
--- a/src/renderer/src/components/message/MessageList.vue
+++ b/src/renderer/src/components/message/MessageList.vue
@@ -3,7 +3,6 @@
     <div
       ref="messagesContainer"
       class="message-list-container relative flex-1 overflow-y-auto scroll-smooth w-full h-full"
-      @scroll="handleScroll"
     >
       <div
         ref="messageList"
@@ -83,11 +82,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, nextTick, watch, computed, reactive } from 'vue'
+import { ref, onMounted, onUnmounted, nextTick, watch, computed, reactive } from 'vue'
 import MessageItemAssistant from './MessageItemAssistant.vue'
 import MessageItemUser from './MessageItemUser.vue'
 import { AssistantMessage, UserMessage } from '@shared/chat'
-import { useElementBounding, useDebounceFn } from '@vueuse/core'
+import { useElementBounding } from '@vueuse/core'
 import { Button } from '@/components/ui/button'
 import { Icon } from '@iconify/vue'
 import { useChatStore } from '@/stores/chat'
@@ -286,6 +285,7 @@ onMounted(() => {
     scrollToBottom()
     nextTick(() => {
       visible.value = true
+      setupScrollObserver()
     })
   }, 100)
 
@@ -301,16 +301,37 @@ onMounted(() => {
   )
 })
 
+onUnmounted(() => {
+  if (intersectionObserver) {
+    intersectionObserver.disconnect()
+    intersectionObserver = null
+  }
+})
+
 const aboveThreshold = ref(false)
-const SCROLL_THRESHOLD = 20
-const handleScroll = useDebounceFn((event) => {
-  const rect = messageList.value?.getBoundingClientRect()
-  const container = event.target
-  if (rect?.height) {
-    const scrollBottom = container.scrollHeight - (container.scrollTop + container.clientHeight)
-    aboveThreshold.value = scrollBottom > SCROLL_THRESHOLD
+let intersectionObserver: IntersectionObserver | null = null
+
+const setupScrollObserver = () => {
+  if (intersectionObserver) {
+    intersectionObserver.disconnect()
+  }
+
+  intersectionObserver = new IntersectionObserver(
+    (entries) => {
+      const entry = entries[0]
+      aboveThreshold.value = !entry.isIntersecting
+    },
+    {
+      root: messagesContainer.value,
+      rootMargin: '0px 0px 20px 0px', // 20px 的缓冲区
+      threshold: 0
+    }
+  )
+
+  if (scrollAnchor.value) {
+    intersectionObserver.observe(scrollAnchor.value)
   }
-}, 100)
+}
 
 const showCancelButton = computed(() => {
   return chatStore.generatingThreadIds.has(chatStore.getActiveThreadId() ?? '')
diff --git a/src/types/i18n.d.ts b/src/types/i18n.d.ts
index 1482677e6..0ae587e67 100644
--- a/src/types/i18n.d.ts
+++ b/src/types/i18n.d.ts
@@ -1,3 +1,5 @@
+import { DefineLocaleMessage } from 'vue-i18n'
+
 declare module 'vue-i18n' {
   interface DefineLocaleMessage {
     title: string
@@ -400,27 +402,27 @@ declare module 'vue-i18n' {
         name: string
         desc: string
       }
-      'deepchat-inmemory/custom-prompts-server': {
+      "deepchat-inmemory/custom-prompts-server": {
         name: string
         desc: string
       }
-      'deepchat-inmemory/deep-research-server': {
+      "deepchat-inmemory/deep-research-server": {
         name: string
         desc: string
       }
-      'deepchat-inmemory/auto-prompting-server': {
+      "deepchat-inmemory/auto-prompting-server": {
         name: string
         desc: string
       }
-      'deepchat-inmemory/conversation-search-server': {
+      "deepchat-inmemory/conversation-search-server": {
         name: string
         desc: string
       }
-      'deepchat-inmemory/meeting-server': {
+      "deepchat-inmemory/meeting-server": {
         name: string
         desc: string
       }
-      'deepchat/apple-server': {
+      "deepchat/apple-server": {
         name: string
         desc: string
       }
@@ -536,15 +538,15 @@ declare module 'vue-i18n' {
     chat: string
     welcome: string
     settings: string
-    'settings-common': string
-    'settings-provider': string
-    'settings-mcp': string
-    'settings-database': string
-    'settings-about': string
-    'settings-shortcut': string
-    'settings-display': string
-    'settings-knowledge-base': string
-    'settings-prompt': string
+    "settings-common": string
+    "settings-provider": string
+    "settings-mcp": string
+    "settings-database": string
+    "settings-about": string
+    "settings-shortcut": string
+    "settings-display": string
+    "settings-knowledge-base": string
+    "settings-prompt": string
     common: {
       title: string
       resetData: string
@@ -1088,11 +1090,11 @@ declare module 'vue-i18n' {
     }
     display: {
       fontSize: string
-      'text-sm': string
-      'text-base': string
-      'text-lg': string
-      'text-xl': string
-      'text-2xl': string
+      "text-sm": string
+      "text-base": string
+      "text-lg": string
+      "text-xl": string
+      "text-2xl": string
       floatingButton: string
       floatingButtonDesc: string
     }

From f00ed51d0ed6c0e7b93bbc1addbcb489c9721f96 Mon Sep 17 00:00:00 2001
From: yyhhyyyyyy <yyhhyyyyyy8@gmail.com>
Date: Tue, 29 Jul 2025 23:44:59 +0800
Subject: [PATCH 2/2] style: code fmt

---
 src/types/i18n.d.ts | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/types/i18n.d.ts b/src/types/i18n.d.ts
index 0ae587e67..e3a6ee79e 100644
--- a/src/types/i18n.d.ts
+++ b/src/types/i18n.d.ts
@@ -402,27 +402,27 @@ declare module 'vue-i18n' {
         name: string
         desc: string
       }
-      "deepchat-inmemory/custom-prompts-server": {
+      'deepchat-inmemory/custom-prompts-server': {
         name: string
         desc: string
       }
-      "deepchat-inmemory/deep-research-server": {
+      'deepchat-inmemory/deep-research-server': {
         name: string
         desc: string
       }
-      "deepchat-inmemory/auto-prompting-server": {
+      'deepchat-inmemory/auto-prompting-server': {
         name: string
         desc: string
       }
-      "deepchat-inmemory/conversation-search-server": {
+      'deepchat-inmemory/conversation-search-server': {
         name: string
         desc: string
       }
-      "deepchat-inmemory/meeting-server": {
+      'deepchat-inmemory/meeting-server': {
         name: string
         desc: string
       }
-      "deepchat/apple-server": {
+      'deepchat/apple-server': {
         name: string
         desc: string
       }
@@ -538,15 +538,15 @@ declare module 'vue-i18n' {
     chat: string
     welcome: string
     settings: string
-    "settings-common": string
-    "settings-provider": string
-    "settings-mcp": string
-    "settings-database": string
-    "settings-about": string
-    "settings-shortcut": string
-    "settings-display": string
-    "settings-knowledge-base": string
-    "settings-prompt": string
+    'settings-common': string
+    'settings-provider': string
+    'settings-mcp': string
+    'settings-database': string
+    'settings-about': string
+    'settings-shortcut': string
+    'settings-display': string
+    'settings-knowledge-base': string
+    'settings-prompt': string
     common: {
       title: string
       resetData: string
@@ -1090,11 +1090,11 @@ declare module 'vue-i18n' {
     }
     display: {
       fontSize: string
-      "text-sm": string
-      "text-base": string
-      "text-lg": string
-      "text-xl": string
-      "text-2xl": string
+      'text-sm': string
+      'text-base': string
+      'text-lg': string
+      'text-xl': string
+      'text-2xl': string
       floatingButton: string
       floatingButtonDesc: string
     }