@myun/gimi-chat 0.9.3 → 0.9.5

package/dist/components/message-list/index.js

@@ -215,6 +215,11 @@ var MessageList = function MessageList(_ref) {
     useVirtualScroll = _useState4[0],
     setUseVirtualScroll = _useState4[1];
   var VIRTUAL_SCROLL_THRESHOLD = 1200;
+  var isSafari = useMemo(function () {
+    if (typeof navigator === 'undefined') return false;
+    var ua = navigator.userAgent;
+    return /Safari/i.test(ua) && !/Chrome|Chromium|Edg/i.test(ua);
+  }, []);
   useEffect(function () {
     if (containerRef.current && containerRef.current !== scrollParent) {
       setScrollParent(containerRef.current);
@@ -229,10 +234,13 @@ var MessageList = function MessageList(_ref) {
     });
   }, [chatList, hideUserMessage]);
   useEffect(function () {
-    if (!scrollParent) return;
+    if (!scrollParent || useVirtualScroll) return;
     var checkScrollHeight = function checkScrollHeight() {
       var shouldUseVirtual = scrollParent.scrollHeight > VIRTUAL_SCROLL_THRESHOLD && scrollParent.scrollHeight > scrollParent.clientHeight;
-      setUseVirtualScroll(shouldUseVirtual);
+      console.log('shouldUseVirtual', shouldUseVirtual);
+      if (shouldUseVirtual) {
+        setUseVirtualScroll(true);
+      }
     };
     var resizeObserver = new ResizeObserver(function () {
       checkScrollHeight();
@@ -242,7 +250,7 @@ var MessageList = function MessageList(_ref) {
     return function () {
       resizeObserver.disconnect();
     };
-  }, [scrollParent, visibleChatList.length]);
+  }, [scrollParent, visibleChatList.length, useVirtualScroll]);
   var renderItem = useCallback(function (_, v) {
     return /*#__PURE__*/React.createElement(MessageItem, {
       v: v,
@@ -281,7 +289,7 @@ var MessageList = function MessageList(_ref) {
     className: classNames(styles.container)
   }, visibleChatList.length > 0 && /*#__PURE__*/React.createElement("div", {
     className: styles.textWrap
-  }, useVirtualScroll && scrollParent && platform === 'myun' ? /*#__PURE__*/React.createElement(Virtuoso, {
+  }, useVirtualScroll && scrollParent && platform === 'myun' && !isSafari ? /*#__PURE__*/React.createElement(Virtuoso, {
     style: {
       height: '100%',
       minHeight: 1

package/dist/hooks/useScroll.js

@@ -28,7 +28,8 @@ var useScroll = function useScroll(containerRef) {
     lastScrollTop: 0,
     isUserInteracting: false,
     wasAtBottom: true,
-    lastWheelAt: 0
+    lastWheelAt: 0,
+    lastScrollAt: 0
   }).current;
   var scrollBottomNow = React.useCallback(function () {
     var tries = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 4;
@@ -123,9 +124,9 @@ var useScroll = function useScroll(containerRef) {
     var canScroll = scrollHeight - clientHeight > 1;
     if (!canScroll) return;
     var position = Math.max(0, scrollHeight - clientHeight - scrollTop);
-    if (e.deltaY < -2) {
+    if (e.deltaY < 0) {
       markUserInteraction(true);
-    } else if (e.deltaY > 2 && position <= bottomPosition) {
+    } else if (e.deltaY > 0 && position <= bottomPosition) {
       markUserInteraction(false);
     }
   }, 100), [containerRef.current, bottomPosition, markUserInteraction, refs]);
@@ -139,13 +140,11 @@ var useScroll = function useScroll(containerRef) {
     setCurrentPosition(position);
     setIsScrolling(true);
     refs.wasAtBottom = position <= bottomPosition * 2;
+    refs.lastScrollAt = Date.now();
     var scrollDelta = scrollTop - refs.lastScrollTop;
-    if (Math.abs(scrollDelta) > 2) {
+    if (Math.abs(scrollDelta) > 0.5) {
       if (scrollDelta < 0) {
-        var now = Date.now();
-        if (refs.isUserInteracting || now - refs.lastWheelAt < 600) {
-          markUserInteraction(true);
-        }
+        markUserInteraction(true);
       } else if (scrollDelta > 0 && position <= bottomPosition) {
         markUserInteraction(false);
       }
@@ -194,6 +193,8 @@ var useScroll = function useScroll(containerRef) {
       }
       ;
       if (refs.isUserInteracting) return;
+      var now = Date.now();
+      if (now - refs.lastWheelAt < 200 || now - refs.lastScrollAt < 200) return;
       if (refs.wasAtBottom || distanceToBottom <= bottomPosition * 5) {
         scrollBottomNow(4);
       }