sceyt-chat-react-uikit 1.8.5-beta.13 → 1.8.5-beta.14

package/components/Messages/MessageList/useChatController.d.ts

@@ -44,8 +44,9 @@ export interface UseChatControllerParams {
     selectedMessagesMap: Map<string, any>;
     allowEditDeleteIncomingMessage: boolean;
     dispatch: (...args: any[]) => void;
+    tabIsActive?: boolean;
 }
-export declare function useChatController({ messages, channel, hasPrevMessages, hasNextMessages, loadingPrevMessages, loadingNextMessages, connectionStatus, scrollToNewMessage, scrollToMentionedMessage, showScrollToNewMessageButton, unreadScrollTo, unreadMessageId, selectedMessagesMap, allowEditDeleteIncomingMessage, dispatch }: UseChatControllerParams): {
+export declare function useChatController({ messages, channel, hasPrevMessages, hasNextMessages, loadingPrevMessages, loadingNextMessages, connectionStatus, scrollToNewMessage, scrollToMentionedMessage, showScrollToNewMessageButton, unreadScrollTo, unreadMessageId, selectedMessagesMap, allowEditDeleteIncomingMessage, tabIsActive, dispatch }: UseChatControllerParams): {
     scrollRef: import("react").MutableRefObject<HTMLDivElement | null>;
     setLastVisibleMessageId: (message: IMessage) => void;
     handleScrollToRepliedMessage: (itemId: string, smooth?: boolean) => Promise<void>;

package/index.js

@@ -12084,6 +12084,8 @@ function updateMessageStatusOnMap(channelId, newMarkers, isOwnMarker) {
   targetIds.forEach(function (messageId) {
     var messageShouldBeUpdated = messagesMap[channelId][messageId];
     if (messageShouldBeUpdated) {
+      var isExplicit = explicitIds.includes(messageId);
+      if (!isExplicit && shouldSkipDeliveryStatusUpdate(newMarkers.name, messageShouldBeUpdated.deliveryStatus)) return;
       var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(messageShouldBeUpdated, {
         deliveryStatus: newMarkers.name,
         marker: newMarkers.marker
@@ -12516,6 +12518,7 @@ var messageSlice = createSlice({
         var beforeMax = isForwardMarker && maxMarkerId !== null && !!message.id ? BigInt(message.id) <= maxMarkerId : false;
         if (!inMap && !beforeMax) continue;
         if (message.state !== 'Deleted') {
+          if (!inMap && shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) continue;
           var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, {
             deliveryStatus: markerName,
             marker: marker
@@ -15634,7 +15637,7 @@ var getResolvedChannelLastMessage = function getResolvedChannelLastMessage(chann
 };
 function handleChannelMessageEvent(args, SceytChatClient) {
   var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$parentMessag;
-  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _storedChannel$lastMe7, lastMessageIsVisible, messagesHasNext, existingMessage, channelDataUpdate, groupName, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
+  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _storedChannel$lastMe7, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -15686,7 +15689,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         return effects.put(updateChannelLastMessageAC(resolvedLastMessageUpdate, channelForAdd));
       case 4:
         if (!(channel.id === activeChannelId)) {
-          _context.n = 9;
+          _context.n = 10;
           break;
         }
         lastMessageIsVisible = storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe7 = storedChannel.lastMessage) !== null && _storedChannel$lastMe7 !== void 0 && _storedChannel$lastMe7.id ? Object.values(getVisibleMessagesMap()).some(function (visibleMessage) {
@@ -15695,7 +15698,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         }) : false;
         messagesHasNext = store.getState().MessageReducer.messagesHasNext;
         if (!(!messagesHasNext && lastMessageIsInActiveWindow || !messages.length || !messages)) {
-          _context.n = 9;
+          _context.n = 10;
           break;
         }
         existingMessage = store.getState().MessageReducer.activeChannelMessages.find(function (m) {
@@ -15721,10 +15724,16 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         _context.n = 8;
         return effects.put(loadOGMetadataForLinkAC([message], true));
       case 8:
-        if (lastMessageIsVisible) {
-          navigateToLatest(true);
-        }
+        _context.n = 9;
+        return effects.select(browserTabIsActiveSelector);
       case 9:
+        tabIsActive = _context.v;
+        if (lastMessageIsVisible && tabIsActive) {
+          setTimeout(function () {
+            navigateToLatest(true);
+          }, 50);
+        }
+      case 10:
         addMessageToMap(channel.id, message);
         channelDataUpdate = _extends({
           messageCount: channelForAdd.messageCount,
@@ -15745,33 +15754,33 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         if (storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe9 = storedChannel.lastMessage) !== null && _storedChannel$lastMe9 !== void 0 && _storedChannel$lastMe9.id) {
           appendMessageToLatestSegment(channel.id, message.id, storedChannel.lastMessage.id);
         }
-        _context.n = 10;
+        _context.n = 11;
         return effects.put(updateChannelDataAC(channel.id, channelDataUpdate));
-      case 10:
+      case 11:
         groupName = getChannelGroupName(channel);
-        _context.n = 11;
+        _context.n = 12;
         return effects.put(updateSearchedChannelDataAC(channel.id, channelDataUpdate, groupName));
-      case 11:
+      case 12:
         showNotifications = getShowNotifications();
         if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !channel.muted)) {
-          _context.n = 14;
+          _context.n = 15;
           break;
         }
         if (!(Notification.permission === 'granted')) {
-          _context.n = 14;
+          _context.n = 15;
           break;
         }
-        _context.n = 12;
+        _context.n = 13;
         return effects.select(browserTabIsActiveSelector);
-      case 12:
-        tabIsActive = _context.v;
-        if (!(document.visibilityState !== 'visible' || !tabIsActive || channel.id !== activeChannelId)) {
-          _context.n = 14;
+      case 13:
+        _tabIsActive = _context.v;
+        if (!(document.visibilityState !== 'visible' || !_tabIsActive || channel.id !== activeChannelId)) {
+          _context.n = 15;
           break;
         }
-        _context.n = 13;
+        _context.n = 14;
         return effects.select(contactsMapSelector);
-      case 13:
+      case 14:
         contactsMap = _context.v;
         getFromContacts = getShowOnlyContactUsers();
         state = store.getState();
@@ -15791,25 +15800,25 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         setNotification((message === null || message === void 0 ? void 0 : message.type) === exports.MESSAGE_TYPE.VIEW_ONCE ? "Self-destructing" : messageBody, message.user, channel, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
           return att.type !== attachmentTypes.link;
         }) : undefined);
-      case 14:
+      case 15:
         if (!(message.repliedInThread && (_message$parentMessag = message.parentMessage) !== null && _message$parentMessag !== void 0 && _message$parentMessag.id)) {
-          _context.n = 16;
+          _context.n = 17;
           break;
         }
-        _context.n = 15;
+        _context.n = 16;
         return effects.put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-      case 15:
-        _context.n = 17;
-        break;
       case 16:
-        _context.n = 17;
-        return effects.put(markMessagesAsDeliveredAC(channel.id, [message.id]));
+        _context.n = 18;
+        break;
       case 17:
+        _context.n = 18;
+        return effects.put(markMessagesAsDeliveredAC(channel.id, [message.id]));
+      case 18:
         updateChannelOnAllChannels(channel.id, channelDataUpdate);
         if (shouldUpdateLastMessage) {
           updateChannelLastMessageOnAllChannels(channel.id, resolvedLastMessageUpdate);
         }
-      case 18:
+      case 19:
         return _context.a(2);
     }
   }, _marked$1);
@@ -42741,7 +42750,8 @@ var Message$1 = function Message(_ref) {
     selectedMessagesMap = _ref.selectedMessagesMap,
     contactsMap = _ref.contactsMap,
     openedMessageMenuId = _ref.openedMessageMenuId,
-    tabIsActive = _ref.tabIsActive,
+    _ref$tabIsActive = _ref.tabIsActive,
+    tabIsActive = _ref$tabIsActive === void 0 ? true : _ref$tabIsActive,
     connectionStatus = _ref.connectionStatus,
     messageTextFontSize = _ref.messageTextFontSize,
     messageTextLineHeight = _ref.messageTextLineHeight,
@@ -42996,14 +43006,14 @@ var Message$1 = function Message(_ref) {
     }
     if (isVisible && message.incoming && !(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-    })) && !disableAutoReadTracking && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    })) && !disableAutoReadTracking && tabIsActive && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
       if (queueReadMarker) {
         queueReadMarker(channel.id, message.id);
       } else {
         dispatch(markMessagesAsReadAC(channel.id, [message.id]));
       }
     }
-  }, [dispatch, message.incoming, message.userMarkers, message.id, isVisible, channel.id, channel.newMessageCount, connectionStatus, queueReadMarker, queueDeliveredMarker, disableAutoReadTracking]);
+  }, [dispatch, message.incoming, message.userMarkers, message.id, isVisible, channel.id, channel.newMessageCount, connectionStatus, queueReadMarker, queueDeliveredMarker, disableAutoReadTracking, tabIsActive]);
   var handleForwardMessage = React.useCallback(function (channelIds) {
     if (channelIds && channelIds.length) {
       channelIds.forEach(function (channelId) {
@@ -43057,22 +43067,17 @@ var Message$1 = function Message(_ref) {
         removeMessageFromVisibleMessagesMap(message);
       }
     }
-  }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.isLinkedChannel, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message]);
+  }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.isLinkedChannel, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message, tabIsActive]);
   React.useEffect(function () {
     if (!isVisible && infoPopupOpen) {
       setInfoPopupOpen(false);
     }
   }, [isVisible, infoPopupOpen]);
-  useDidUpdate(function () {
-    if (tabIsActive) {
-      handleSendReadMarker();
-    }
-  }, [tabIsActive]);
   useDidUpdate(function () {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       handleSendReadMarker();
     }
-  }, [connectionStatus]);
+  }, [connectionStatus, handleSendReadMarker]);
   React.useEffect(function () {
     if (emojisPopupOpen) {
       var bottomPos = messageItemRef.current ? messageItemRef.current.getBoundingClientRect().bottom : 0;
@@ -43672,6 +43677,8 @@ function useChatController(_ref3) {
     unreadMessageId = _ref3.unreadMessageId,
     selectedMessagesMap = _ref3.selectedMessagesMap,
     allowEditDeleteIncomingMessage = _ref3.allowEditDeleteIncomingMessage,
+    _ref3$tabIsActive = _ref3.tabIsActive,
+    tabIsActive = _ref3$tabIsActive === void 0 ? true : _ref3$tabIsActive,
     dispatch = _ref3.dispatch;
   var scrollRef = React.useRef(null);
   var itemElementsRef = React.useRef(new Map());
@@ -43944,7 +43951,7 @@ function useChatController(_ref3) {
     }, lockDuration);
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = React.useCallback(function () {
-    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo) {
+    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
       return;
     }
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
@@ -43988,7 +43995,7 @@ function useChatController(_ref3) {
       registerLocallyReadUnreadMessages(ids.length);
       dispatch(markMessagesAsReadAC(channel.id, ids));
     });
-  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo]);
+  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo, tabIsActive]);
   var timelineItems = React.useMemo(function () {
     var unreadStartIndex = getUnreadDividerIndex(messages, unreadMessageId);
     return messages.flatMap(function (message, index) {
@@ -45786,7 +45793,8 @@ var MessageList = function MessageList(_ref) {
       unreadMessageId: unreadMessageId,
       selectedMessagesMap: selectedMessagesMap,
       allowEditDeleteIncomingMessage: allowEditDeleteIncomingMessage,
-      dispatch: dispatch
+      dispatch: dispatch,
+      tabIsActive: browserTabIsActive
     }),
     scrollRef = _useChatController.scrollRef,
     setLastVisibleMessageId = _useChatController.setLastVisibleMessageId,

package/index.modern.js

@@ -12083,6 +12083,8 @@ function updateMessageStatusOnMap(channelId, newMarkers, isOwnMarker) {
   targetIds.forEach(function (messageId) {
     var messageShouldBeUpdated = messagesMap[channelId][messageId];
     if (messageShouldBeUpdated) {
+      var isExplicit = explicitIds.includes(messageId);
+      if (!isExplicit && shouldSkipDeliveryStatusUpdate(newMarkers.name, messageShouldBeUpdated.deliveryStatus)) return;
       var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(messageShouldBeUpdated, {
         deliveryStatus: newMarkers.name,
         marker: newMarkers.marker
@@ -12515,6 +12517,7 @@ var messageSlice = createSlice({
         var beforeMax = isForwardMarker && maxMarkerId !== null && !!message.id ? BigInt(message.id) <= maxMarkerId : false;
         if (!inMap && !beforeMax) continue;
         if (message.state !== 'Deleted') {
+          if (!inMap && shouldSkipDeliveryStatusUpdate(markerName, message.deliveryStatus)) continue;
           var statusUpdatedMessage = updateMessageDeliveryStatusAndMarkers(message, {
             deliveryStatus: markerName,
             marker: marker
@@ -15633,7 +15636,7 @@ var getResolvedChannelLastMessage = function getResolvedChannelLastMessage(chann
 };
 function handleChannelMessageEvent(args, SceytChatClient) {
   var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$parentMessag;
-  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _storedChannel$lastMe7, lastMessageIsVisible, messagesHasNext, existingMessage, channelDataUpdate, groupName, showNotifications, tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
+  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, shouldUpdateLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, _storedChannel$lastMe7, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -15685,7 +15688,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         return put(updateChannelLastMessageAC(resolvedLastMessageUpdate, channelForAdd));
       case 4:
         if (!(channel.id === activeChannelId)) {
-          _context.n = 9;
+          _context.n = 10;
           break;
         }
         lastMessageIsVisible = storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe7 = storedChannel.lastMessage) !== null && _storedChannel$lastMe7 !== void 0 && _storedChannel$lastMe7.id ? Object.values(getVisibleMessagesMap()).some(function (visibleMessage) {
@@ -15694,7 +15697,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         }) : false;
         messagesHasNext = store.getState().MessageReducer.messagesHasNext;
         if (!(!messagesHasNext && lastMessageIsInActiveWindow || !messages.length || !messages)) {
-          _context.n = 9;
+          _context.n = 10;
           break;
         }
         existingMessage = store.getState().MessageReducer.activeChannelMessages.find(function (m) {
@@ -15720,10 +15723,16 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         _context.n = 8;
         return put(loadOGMetadataForLinkAC([message], true));
       case 8:
-        if (lastMessageIsVisible) {
-          navigateToLatest(true);
-        }
+        _context.n = 9;
+        return select(browserTabIsActiveSelector);
       case 9:
+        tabIsActive = _context.v;
+        if (lastMessageIsVisible && tabIsActive) {
+          setTimeout(function () {
+            navigateToLatest(true);
+          }, 50);
+        }
+      case 10:
         addMessageToMap(channel.id, message);
         channelDataUpdate = _extends({
           messageCount: channelForAdd.messageCount,
@@ -15744,33 +15753,33 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         if (storedChannel !== null && storedChannel !== void 0 && (_storedChannel$lastMe9 = storedChannel.lastMessage) !== null && _storedChannel$lastMe9 !== void 0 && _storedChannel$lastMe9.id) {
           appendMessageToLatestSegment(channel.id, message.id, storedChannel.lastMessage.id);
         }
-        _context.n = 10;
+        _context.n = 11;
         return put(updateChannelDataAC(channel.id, channelDataUpdate));
-      case 10:
+      case 11:
         groupName = getChannelGroupName(channel);
-        _context.n = 11;
+        _context.n = 12;
         return put(updateSearchedChannelDataAC(channel.id, channelDataUpdate, groupName));
-      case 11:
+      case 12:
         showNotifications = getShowNotifications();
         if (!(showNotifications && !message.silent && message.user.id !== SceytChatClient.user.id && !channel.muted)) {
-          _context.n = 14;
+          _context.n = 15;
           break;
         }
         if (!(Notification.permission === 'granted')) {
-          _context.n = 14;
+          _context.n = 15;
           break;
         }
-        _context.n = 12;
+        _context.n = 13;
         return select(browserTabIsActiveSelector);
-      case 12:
-        tabIsActive = _context.v;
-        if (!(document.visibilityState !== 'visible' || !tabIsActive || channel.id !== activeChannelId)) {
-          _context.n = 14;
+      case 13:
+        _tabIsActive = _context.v;
+        if (!(document.visibilityState !== 'visible' || !_tabIsActive || channel.id !== activeChannelId)) {
+          _context.n = 15;
           break;
         }
-        _context.n = 13;
+        _context.n = 14;
         return select(contactsMapSelector);
-      case 13:
+      case 14:
         contactsMap = _context.v;
         getFromContacts = getShowOnlyContactUsers();
         state = store.getState();
@@ -15790,25 +15799,25 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         setNotification((message === null || message === void 0 ? void 0 : message.type) === MESSAGE_TYPE.VIEW_ONCE ? "Self-destructing" : messageBody, message.user, channel, undefined, message.attachments && message.attachments.length ? message.attachments.find(function (att) {
           return att.type !== attachmentTypes.link;
         }) : undefined);
-      case 14:
+      case 15:
         if (!(message.repliedInThread && (_message$parentMessag = message.parentMessage) !== null && _message$parentMessag !== void 0 && _message$parentMessag.id)) {
-          _context.n = 16;
+          _context.n = 17;
           break;
         }
-        _context.n = 15;
+        _context.n = 16;
         return put(markMessagesAsDeliveredAC(message.parentMessage.id, [message.id]));
-      case 15:
-        _context.n = 17;
-        break;
       case 16:
-        _context.n = 17;
-        return put(markMessagesAsDeliveredAC(channel.id, [message.id]));
+        _context.n = 18;
+        break;
       case 17:
+        _context.n = 18;
+        return put(markMessagesAsDeliveredAC(channel.id, [message.id]));
+      case 18:
         updateChannelOnAllChannels(channel.id, channelDataUpdate);
         if (shouldUpdateLastMessage) {
           updateChannelLastMessageOnAllChannels(channel.id, resolvedLastMessageUpdate);
         }
-      case 18:
+      case 19:
         return _context.a(2);
     }
   }, _marked$1);
@@ -42740,7 +42749,8 @@ var Message$1 = function Message(_ref) {
     selectedMessagesMap = _ref.selectedMessagesMap,
     contactsMap = _ref.contactsMap,
     openedMessageMenuId = _ref.openedMessageMenuId,
-    tabIsActive = _ref.tabIsActive,
+    _ref$tabIsActive = _ref.tabIsActive,
+    tabIsActive = _ref$tabIsActive === void 0 ? true : _ref$tabIsActive,
     connectionStatus = _ref.connectionStatus,
     messageTextFontSize = _ref.messageTextFontSize,
     messageTextLineHeight = _ref.messageTextLineHeight,
@@ -42995,14 +43005,14 @@ var Message$1 = function Message(_ref) {
     }
     if (isVisible && message.incoming && !(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-    })) && !disableAutoReadTracking && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    })) && !disableAutoReadTracking && tabIsActive && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED) {
       if (queueReadMarker) {
         queueReadMarker(channel.id, message.id);
       } else {
         dispatch(markMessagesAsReadAC(channel.id, [message.id]));
       }
     }
-  }, [dispatch, message.incoming, message.userMarkers, message.id, isVisible, channel.id, channel.newMessageCount, connectionStatus, queueReadMarker, queueDeliveredMarker, disableAutoReadTracking]);
+  }, [dispatch, message.incoming, message.userMarkers, message.id, isVisible, channel.id, channel.newMessageCount, connectionStatus, queueReadMarker, queueDeliveredMarker, disableAutoReadTracking, tabIsActive]);
   var handleForwardMessage = useCallback(function (channelIds) {
     if (channelIds && channelIds.length) {
       channelIds.forEach(function (channelId) {
@@ -43056,22 +43066,17 @@ var Message$1 = function Message(_ref) {
         removeMessageFromVisibleMessagesMap(message);
       }
     }
-  }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.isLinkedChannel, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message]);
+  }, [isVisible, setLastVisibleMessageId, message.id, handleSendReadMarker, channel.isLinkedChannel, channel.lastMessage, scrollToNewMessage.scrollToBottom, dispatch, message, tabIsActive]);
   useEffect(function () {
     if (!isVisible && infoPopupOpen) {
       setInfoPopupOpen(false);
     }
   }, [isVisible, infoPopupOpen]);
-  useDidUpdate(function () {
-    if (tabIsActive) {
-      handleSendReadMarker();
-    }
-  }, [tabIsActive]);
   useDidUpdate(function () {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       handleSendReadMarker();
     }
-  }, [connectionStatus]);
+  }, [connectionStatus, handleSendReadMarker]);
   useEffect(function () {
     if (emojisPopupOpen) {
       var bottomPos = messageItemRef.current ? messageItemRef.current.getBoundingClientRect().bottom : 0;
@@ -43671,6 +43676,8 @@ function useChatController(_ref3) {
     unreadMessageId = _ref3.unreadMessageId,
     selectedMessagesMap = _ref3.selectedMessagesMap,
     allowEditDeleteIncomingMessage = _ref3.allowEditDeleteIncomingMessage,
+    _ref3$tabIsActive = _ref3.tabIsActive,
+    tabIsActive = _ref3$tabIsActive === void 0 ? true : _ref3$tabIsActive,
     dispatch = _ref3.dispatch;
   var scrollRef = useRef(null);
   var itemElementsRef = useRef(new Map());
@@ -43943,7 +43950,7 @@ function useChatController(_ref3) {
     }, lockDuration);
   }, [clearJumpScrollingLock]);
   var queueVisibleUnreadCheck = useCallback(function () {
-    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo) {
+    if (pendingVisibleUnreadFrameRef.current !== null || unreadScrollTo || !tabIsActive) {
       return;
     }
     pendingVisibleUnreadFrameRef.current = requestAnimationFrame(function () {
@@ -43987,7 +43994,7 @@ function useChatController(_ref3) {
       registerLocallyReadUnreadMessages(ids.length);
       dispatch(markMessagesAsReadAC(channel.id, ids));
     });
-  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo]);
+  }, [channel.id, channel.lastDisplayedMessageId, channel.newMessageCount, dispatch, hasNext, messages, registerLocallyReadUnreadMessages, unreadScrollTo, tabIsActive]);
   var timelineItems = useMemo(function () {
     var unreadStartIndex = getUnreadDividerIndex(messages, unreadMessageId);
     return messages.flatMap(function (message, index) {
@@ -45785,7 +45792,8 @@ var MessageList = function MessageList(_ref) {
       unreadMessageId: unreadMessageId,
       selectedMessagesMap: selectedMessagesMap,
       allowEditDeleteIncomingMessage: allowEditDeleteIncomingMessage,
-      dispatch: dispatch
+      dispatch: dispatch,
+      tabIsActive: browserTabIsActive
     }),
     scrollRef = _useChatController.scrollRef,
     setLastVisibleMessageId = _useChatController.setLastVisibleMessageId,

package/package.json

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