@myun/gimi-chat 0.7.4 → 0.7.5

package/dist/components/templates/index.module.css

@@ -5,6 +5,7 @@
   display: flex;
   gap: 20px;
   position: relative;
+  overflow-x: hidden;
 }
 
 .chat_content {

package/dist/hooks/useChatHistory.js

@@ -104,6 +104,7 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
       newChatList,
       lastUserRequestMessage,
       lastMessage,
+      waitForStableHeight,
       _lastUserRequestMessa,
       container,
       _args = arguments;
@@ -132,7 +133,7 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
         case 11:
           res = _context.sent;
           if (!(res && res.status === 0)) {
-            _context.next = 37;
+            _context.next = 38;
             break;
           }
           resData = formatFields(res.result.data, res.result.first ? [] : currentMessageList) || [];
@@ -147,7 +148,7 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
           }
           hasMore.current = res.result.last === undefined ? false : !res.result.last;
           if (!res.result.first) {
-            _context.next = 27;
+            _context.next = 28;
             break;
           }
           dispatch(setMessageList({
@@ -156,15 +157,44 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
           _context.next = 24;
           return checkUnfinishedMessage(_newResData);
         case 24:
-          setTimeout(function () {
-            scrollBottomForce(true);
-            setTimeout(function () {
-              scrollBottomForce(true);
-            }, 50);
-          }, 0);
-          _context.next = 35;
+          // 3. 滚动到底部：待稳定高度后再滚动
+          waitForStableHeight = function waitForStableHeight() {
+            var maxFrames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 32;
+            var lastHeight = -1;
+            var stableFrames = 0;
+            var frames = 0;
+            return new Promise(function (resolve) {
+              var tick = function tick() {
+                var container = containerRef.current;
+                if (!container) {
+                  resolve();
+                  return;
+                }
+                var h = container.scrollHeight;
+                if (h === lastHeight) {
+                  stableFrames += 1;
+                } else {
+                  stableFrames = 0;
+                  lastHeight = h;
+                }
+                frames += 1;
+                if (stableFrames >= 2 || frames >= maxFrames) {
+                  resolve();
+                  return;
+                }
+                requestAnimationFrame(tick);
+              };
+              requestAnimationFrame(tick);
+            });
+          };
+          requestAnimationFrame(function () {
+            waitForStableHeight().then(function () {
+              scrollBottomForce(false);
+            });
+          });
+          _context.next = 36;
           break;
-        case 27:
+        case 28:
           container = containerRef.current;
           if (container) {
             historyScrollRef.current = {
@@ -176,41 +206,41 @@ var useChatHistory = function useChatHistory(checkUnfinishedMessage, scrollBotto
           // 2. 更新数据
           // 判断是否需要重写推荐列表
           if (!((currentAgentObj === null || currentAgentObj === void 0 ? void 0 : currentAgentObj.isEnableRelated) === 1 && !((_lastUserRequestMessa = lastUserRequestMessage) !== null && _lastUserRequestMessa !== void 0 && _lastUserRequestMessa.relatedResourceList) && ((lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'end' || (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.moduleType) === 'COMPLETED'))) {
-            _context.next = 34;
+            _context.next = 35;
             break;
           }
-          _context.next = 32;
+          _context.next = 33;
           return rewriteRecommendListFormHistory(newChatList, lastUserRequestMessage.chatId);
-        case 32:
-          _context.next = 35;
+        case 33:
+          _context.next = 36;
           break;
-        case 34:
+        case 35:
           dispatch(setMessageList({
             messageList: newChatList
           }));
-        case 35:
-          _context.next = 38;
+        case 36:
+          _context.next = 39;
           break;
-        case 37:
+        case 38:
           if (res.status === 1034) {
             Toast.error(res.message || '获取历史记录失败');
           }
-        case 38:
+        case 39:
           isMoreLoadingRef.current = false;
           setIsMoreLoading(false);
-          _context.next = 47;
+          _context.next = 48;
           break;
-        case 42:
-          _context.prev = 42;
+        case 43:
+          _context.prev = 43;
           _context.t0 = _context["catch"](5);
           console.error(_context.t0);
           isMoreLoadingRef.current = false;
           setIsMoreLoading(false);
-        case 47:
+        case 48:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 42]]);
+    }, _callee, null, [[5, 43]]);
   })), [checkUnfinishedMessage, containerRef, dispatch, getMessageList, param.pageIndex, param.pageSize, rewriteRecommendListFormHistory, scrollBottomForce]);
   var loadMore = useCallback(function () {
     if (!hasMore.current || isMoreLoadingRef.current || isMsgRecievingRef.current || !conversationIdRef.current) {

package/dist/hooks/useScroll.js

@@ -26,8 +26,23 @@ var useScroll = function useScroll(containerRef) {
     scrollTimeout: 0,
     interactionTimer: null,
     lastScrollTop: 0,
-    isUserInteracting: false
+    isUserInteracting: false,
+    wasAtBottom: true,
+    lastWheelAt: 0
   }).current;
+  var scrollBottomNow = React.useCallback(function () {
+    var tries = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 4;
+    var count = 0;
+    var tick = function tick() {
+      var container = containerRef.current;
+      if (!container) return;
+      container.scrollTop = container.scrollHeight;
+      count += 1;
+      if (count < tries) requestAnimationFrame(tick);
+    };
+    requestAnimationFrame(tick);
+    setTimeout(tick, 0);
+  }, [containerRef]);
 
   // 标记用户交互状态
   var markUserInteraction = React.useCallback(function (isInteracting) {
@@ -50,18 +65,8 @@ var useScroll = function useScroll(containerRef) {
 
   // 基础滚动到底部
   var scrollBottom = React.useCallback(function () {
-    var container = containerRef.current;
-    if (container) {
-      // 使用 requestAnimationFrame 确保在浏览器渲染前执行，
-      // 并且如果一次不行，尝试在下一帧再做一次，以应对复杂的布局变化
-      var doScroll = function doScroll() {
-        container.scrollTop = container.scrollHeight;
-      };
-      requestAnimationFrame(doScroll);
-      // 双重保证
-      setTimeout(doScroll, 0);
-    }
-  }, [containerRef.current]);
+    scrollBottomNow(2);
+  }, [scrollBottomNow]);
 
   // 智能滚动到底部（只在非用户交互时执行）
   var throttledScrollToBottom = React.useCallback(throttle(function () {
@@ -78,15 +83,24 @@ var useScroll = function useScroll(containerRef) {
       markUserInteraction(false); // 重置为用户非交互状态
 
       if (animate) {
-        container.scrollTo({
-          top: container.scrollHeight,
-          behavior: 'smooth'
-        });
+        var smoothScroll = function smoothScroll() {
+          var current = containerRef.current;
+          if (!current) return;
+          current.scrollTo({
+            top: current.scrollHeight,
+            behavior: 'smooth'
+          });
+        };
+        smoothScroll();
+        setTimeout(smoothScroll, 120);
+        setTimeout(function () {
+          if (!refs.isUserInteracting) scrollBottomNow(3);
+        }, 420);
       } else {
         scrollBottom();
       }
     }
-  }, [containerRef.current, markUserInteraction, scrollBottom]);
+  }, [containerRef.current, markUserInteraction, refs, scrollBottom, scrollBottomNow]);
 
   // 更新滚动位置
   var updateScrollHeight = React.useCallback(function () {
@@ -102,6 +116,7 @@ var useScroll = function useScroll(containerRef) {
   var handleWheel = React.useCallback(throttle(function (e) {
     var container = containerRef.current;
     if (!container) return;
+    refs.lastWheelAt = Date.now();
     var scrollTop = container.scrollTop,
       scrollHeight = container.scrollHeight,
       clientHeight = container.clientHeight;
@@ -113,7 +128,7 @@ var useScroll = function useScroll(containerRef) {
     } else if (e.deltaY > 2 && position <= bottomPosition) {
       markUserInteraction(false);
     }
-  }, 100), [containerRef.current, bottomPosition, markUserInteraction]);
+  }, 100), [containerRef.current, bottomPosition, markUserInteraction, refs]);
   var handleScroll = React.useCallback(throttle(function () {
     if (!containerRef.current) return;
     var _containerRef$current2 = containerRef.current,
@@ -123,10 +138,14 @@ var useScroll = function useScroll(containerRef) {
     var position = Math.max(0, scrollHeight - clientHeight - scrollTop);
     setCurrentPosition(position);
     setIsScrolling(true);
+    refs.wasAtBottom = position <= bottomPosition * 2;
     var scrollDelta = scrollTop - refs.lastScrollTop;
     if (Math.abs(scrollDelta) > 2) {
       if (scrollDelta < 0) {
-        markUserInteraction(true);
+        var now = Date.now();
+        if (refs.isUserInteracting || now - refs.lastWheelAt < 600) {
+          markUserInteraction(true);
+        }
       } else if (scrollDelta > 0 && position <= bottomPosition) {
         markUserInteraction(false);
       }
@@ -168,15 +187,8 @@ var useScroll = function useScroll(containerRef) {
         scrollHeight = container.scrollHeight,
         clientHeight = container.clientHeight;
       var distanceToBottom = scrollHeight - clientHeight - scrollTop;
-
-      // 如果之前就在底部附近，则在新内容加入时保持在底部
-      // 注意：这里的判定逻辑需要考虑到新内容可能还没撑开高度
-      // 所以我们直接尝试在下一帧滚动
-      if (distanceToBottom <= bottomPosition * 5) {
-        // 稍微放宽判定范围，因为新内容可能已经改变了 scrollHeight
-        requestAnimationFrame(function () {
-          container.scrollTop = container.scrollHeight;
-        });
+      if (refs.wasAtBottom || distanceToBottom <= bottomPosition * 5) {
+        scrollBottomNow(4);
       }
     });
     observer.observe(container, {
@@ -187,7 +199,7 @@ var useScroll = function useScroll(containerRef) {
     return function () {
       return observer.disconnect();
     };
-  }, [containerRef.current, bottomPosition]);
+  }, [containerRef.current, bottomPosition, refs, scrollBottomNow]);
   return [throttledScrollToBottom, scrollBottomForce, currentPosition, scrollBottom, updateScrollHeight, isScrolling, isUserScroll];
 };
 export default useScroll;