sceyt-chat-react-uikit 1.8.9-beta.17 → 1.8.9-beta.18

package/index.js

@@ -46854,6 +46854,10 @@ function useChatController(_ref5) {
   var highlightTimeoutRef = React.useRef(null);
   var unreadRestoreCompletedRef = React.useRef(false);
   var previousUnreadScrollToRef = React.useRef(unreadScrollTo);
+  var unreadScrollToRef = React.useRef(unreadScrollTo);
+  var tabIsActiveRef = React.useRef(tabIsActive);
+  var hasNextMessagesRef = React.useRef(hasNextMessages);
+  var needsVisibleUnreadCheckRef = React.useRef(false);
   var historyLoadArmedRef = React.useRef(true);
   var latestLoadArmedRef = React.useRef(true);
   var pendingNewestCountRef = React.useRef(0);
@@ -46965,6 +46969,9 @@ function useChatController(_ref5) {
     visibleMessagesMapRef.current = visibleMessagesMap;
     channelRef.current = channel;
     connectionStatusRef.current = connectionStatus;
+    unreadScrollToRef.current = unreadScrollTo;
+    tabIsActiveRef.current = tabIsActive;
+    hasNextMessagesRef.current = hasNext;
   });
   var oldestConfirmedMessage = getFirstConfirmedMessage(messages);
   var newestConfirmedMessage = getLastConfirmedMessage(messages);
@@ -46998,6 +47005,7 @@ function useChatController(_ref5) {
     });
   }, [channel.id, messages]);
   var hasNext = hasNextMessages || (newestConfirmedMessage ? hasNextContiguousInMap(channel.id, newestConfirmedMessage) : false) || (newestConfirmedMessageId && (_channel$lastMessage = channel.lastMessage) !== null && _channel$lastMessage !== void 0 && _channel$lastMessage.id ? compareMessageIds(channel.lastMessage.id, newestConfirmedMessageId) > 0 : false) || hiddenPendingTailExists;
+  hasNextMessagesRef.current = hasNext;
   var isScrollInteractionActive = React.useCallback(function () {
     return Date.now() - lastScrollActivityAtRef.current < SCROLL_IDLE_MS;
   }, []);
@@ -47102,21 +47110,32 @@ function useChatController(_ref5) {
     }, lockDuration);
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = React.useCallback(function () {
-    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
+    if (pendingVisibleUnreadFrameRef.current !== null) {
+      return;
+    }
+    if (unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+      needsVisibleUnreadCheckRef.current = true;
       return;
     }
+    var scheduledChannelId = channel.id;
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
       pendingVisibleUnreadFrameRef.current = null;
+      var currentChannel = channelRef.current;
+      if (currentChannel.id !== scheduledChannelId || unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+        needsVisibleUnreadCheckRef.current = true;
+        return;
+      }
       var container = scrollRef.current;
       if (!container) {
         return;
       }
-      var unreadStartIndex = getUnreadTrackingStartIndex(messages);
+      var currentMessages = messagesRef.current;
+      var unreadStartIndex = getUnreadTrackingStartIndex(currentMessages);
       if (unreadStartIndex < 0) {
         return;
       }
-      var candidateUnreadMessages = messages.slice(unreadStartIndex);
-      var pinnedToLatestWithoutMorePages = !hasNext && isPinnedToLatest(container);
+      var candidateUnreadMessages = currentMessages.slice(unreadStartIndex);
+      var pinnedToLatestWithoutMorePages = !hasNextMessagesRef.current && isPinnedToLatest(container);
       var containerRect = pinnedToLatestWithoutMorePages ? null : container.getBoundingClientRect();
       var visibleUnreadMessages = candidateUnreadMessages.map(function (message) {
         if (visibleUnreadReportedRef.current.has(message.id)) {
@@ -47137,16 +47156,17 @@ function useChatController(_ref5) {
       var ids = visibleUnreadMessages.filter(isUnreadIncomingMessage).map(function (message) {
         return message.id;
       });
-      if (!ids.length || !channel.id || !channel.newMessageCount) {
+      if (!ids.length || !currentChannel.id || !currentChannel.newMessageCount) {
         return;
       }
       ids.forEach(function (id) {
         visibleUnreadReportedRef.current.add(id);
       });
+      needsVisibleUnreadCheckRef.current = false;
       registerLocallyReadUnreadMessages(ids.length);
-      dispatch(markMessagesAsReadAC(channel.id, ids));
+      dispatch(markMessagesAsReadAC(currentChannel.id, ids));
     });
-  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo, tabIsActive]);
+  }, [channel.id, dispatch, registerLocallyReadUnreadMessages]);
   var timelineItems = React.useMemo(function () {
     var unreadStartIndex = getUnreadDividerIndex(messages, unreadMessageId);
     return messages.flatMap(function (message, index) {
@@ -48574,8 +48594,15 @@ function useChatController(_ref5) {
     if (!previousUnreadScrollTo || unreadScrollTo) {
       return;
     }
+    needsVisibleUnreadCheckRef.current = true;
     queueVisibleUnreadCheck();
   }, [queueVisibleUnreadCheck, unreadScrollTo]);
+  React.useEffect(function () {
+    if (!needsVisibleUnreadCheckRef.current || unreadScrollTo || !tabIsActive || connectionStatus !== CONNECTION_STATUS.CONNECTED) {
+      return;
+    }
+    queueVisibleUnreadCheck();
+  }, [connectionStatus, queueVisibleUnreadCheck, tabIsActive, unreadScrollTo]);
   React.useEffect(function () {
     return function () {
       var _pendingWindowLoadRef3, _pendingEdgeLoadRefs$5, _pendingEdgeLoadRefs$6;

package/index.modern.js

@@ -46834,6 +46834,10 @@ function useChatController(_ref5) {
   var highlightTimeoutRef = useRef(null);
   var unreadRestoreCompletedRef = useRef(false);
   var previousUnreadScrollToRef = useRef(unreadScrollTo);
+  var unreadScrollToRef = useRef(unreadScrollTo);
+  var tabIsActiveRef = useRef(tabIsActive);
+  var hasNextMessagesRef = useRef(hasNextMessages);
+  var needsVisibleUnreadCheckRef = useRef(false);
   var historyLoadArmedRef = useRef(true);
   var latestLoadArmedRef = useRef(true);
   var pendingNewestCountRef = useRef(0);
@@ -46945,6 +46949,9 @@ function useChatController(_ref5) {
     visibleMessagesMapRef.current = visibleMessagesMap;
     channelRef.current = channel;
     connectionStatusRef.current = connectionStatus;
+    unreadScrollToRef.current = unreadScrollTo;
+    tabIsActiveRef.current = tabIsActive;
+    hasNextMessagesRef.current = hasNext;
   });
   var oldestConfirmedMessage = getFirstConfirmedMessage(messages);
   var newestConfirmedMessage = getLastConfirmedMessage(messages);
@@ -46978,6 +46985,7 @@ function useChatController(_ref5) {
     });
   }, [channel.id, messages]);
   var hasNext = hasNextMessages || (newestConfirmedMessage ? hasNextContiguousInMap(channel.id, newestConfirmedMessage) : false) || (newestConfirmedMessageId && (_channel$lastMessage = channel.lastMessage) !== null && _channel$lastMessage !== void 0 && _channel$lastMessage.id ? compareMessageIds(channel.lastMessage.id, newestConfirmedMessageId) > 0 : false) || hiddenPendingTailExists;
+  hasNextMessagesRef.current = hasNext;
   var isScrollInteractionActive = useCallback(function () {
     return Date.now() - lastScrollActivityAtRef.current < SCROLL_IDLE_MS;
   }, []);
@@ -47082,21 +47090,32 @@ function useChatController(_ref5) {
     }, lockDuration);
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = useCallback(function () {
-    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
+    if (pendingVisibleUnreadFrameRef.current !== null) {
+      return;
+    }
+    if (unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+      needsVisibleUnreadCheckRef.current = true;
       return;
     }
+    var scheduledChannelId = channel.id;
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
       pendingVisibleUnreadFrameRef.current = null;
+      var currentChannel = channelRef.current;
+      if (currentChannel.id !== scheduledChannelId || unreadScrollToRef.current || !tabIsActiveRef.current || connectionStatusRef.current !== CONNECTION_STATUS.CONNECTED) {
+        needsVisibleUnreadCheckRef.current = true;
+        return;
+      }
       var container = scrollRef.current;
       if (!container) {
         return;
       }
-      var unreadStartIndex = getUnreadTrackingStartIndex(messages);
+      var currentMessages = messagesRef.current;
+      var unreadStartIndex = getUnreadTrackingStartIndex(currentMessages);
       if (unreadStartIndex < 0) {
         return;
       }
-      var candidateUnreadMessages = messages.slice(unreadStartIndex);
-      var pinnedToLatestWithoutMorePages = !hasNext && isPinnedToLatest(container);
+      var candidateUnreadMessages = currentMessages.slice(unreadStartIndex);
+      var pinnedToLatestWithoutMorePages = !hasNextMessagesRef.current && isPinnedToLatest(container);
       var containerRect = pinnedToLatestWithoutMorePages ? null : container.getBoundingClientRect();
       var visibleUnreadMessages = candidateUnreadMessages.map(function (message) {
         if (visibleUnreadReportedRef.current.has(message.id)) {
@@ -47117,16 +47136,17 @@ function useChatController(_ref5) {
       var ids = visibleUnreadMessages.filter(isUnreadIncomingMessage).map(function (message) {
         return message.id;
       });
-      if (!ids.length || !channel.id || !channel.newMessageCount) {
+      if (!ids.length || !currentChannel.id || !currentChannel.newMessageCount) {
         return;
       }
       ids.forEach(function (id) {
         visibleUnreadReportedRef.current.add(id);
       });
+      needsVisibleUnreadCheckRef.current = false;
       registerLocallyReadUnreadMessages(ids.length);
-      dispatch(markMessagesAsReadAC(channel.id, ids));
+      dispatch(markMessagesAsReadAC(currentChannel.id, ids));
     });
-  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo, tabIsActive]);
+  }, [channel.id, dispatch, registerLocallyReadUnreadMessages]);
   var timelineItems = useMemo(function () {
     var unreadStartIndex = getUnreadDividerIndex(messages, unreadMessageId);
     return messages.flatMap(function (message, index) {
@@ -48554,8 +48574,15 @@ function useChatController(_ref5) {
     if (!previousUnreadScrollTo || unreadScrollTo) {
       return;
     }
+    needsVisibleUnreadCheckRef.current = true;
     queueVisibleUnreadCheck();
   }, [queueVisibleUnreadCheck, unreadScrollTo]);
+  useEffect(function () {
+    if (!needsVisibleUnreadCheckRef.current || unreadScrollTo || !tabIsActive || connectionStatus !== CONNECTION_STATUS.CONNECTED) {
+      return;
+    }
+    queueVisibleUnreadCheck();
+  }, [connectionStatus, queueVisibleUnreadCheck, tabIsActive, unreadScrollTo]);
   useEffect(function () {
     return function () {
       var _pendingWindowLoadRef3, _pendingEdgeLoadRefs$5, _pendingEdgeLoadRefs$6;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sceyt-chat-react-uikit",
-  "version": "1.8.9-beta.17",
+  "version": "1.8.9-beta.18",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",