sceyt-chat-react-uikit 1.8.8-beta.5 → 1.8.8-beta.6

package/index.js

@@ -9289,7 +9289,8 @@ var channelSlice = createSlice({
         config = _action$payload3.config,
         channelId = _action$payload3.channelId,
         moveUp = _action$payload3.moveUp,
-        sort = _action$payload3.sort;
+        sort = _action$payload3.sort,
+        add = _action$payload3.add;
       if (moveUp) {
         var updateChannel;
         var updatedChannels = state.channels.filter(function (chan) {
@@ -9298,8 +9299,8 @@ var channelSlice = createSlice({
           }
           return chan.id !== channelId;
         });
-        if (updateChannel) {
-          updateChannel = _extends({}, updateChannel, config);
+        if (updateChannel || add) {
+          updateChannel = _extends({}, updateChannel || {}, config);
           state.channels = sortChannelByLastMessage([updateChannel].concat(updatedChannels));
         }
       } else {
@@ -13565,12 +13566,13 @@ var updateChannelAC = function updateChannelAC(channelId, config) {
     }
   };
 };
-var updateChannelDataAC = function updateChannelDataAC(channelId, config, moveUp, sort) {
+var updateChannelDataAC = function updateChannelDataAC(channelId, config, moveUp, sort, add) {
   return updateChannelData({
     config: config,
     channelId: channelId,
     moveUp: moveUp,
-    sort: sort
+    sort: sort,
+    add: add
   });
 };
 var updateChannelsMembersAC = function updateChannelsMembersAC(members) {
@@ -16667,7 +16669,7 @@ function sendTextMessage(action) {
 }
 function forwardMessage(action) {
   var _message$user;
-  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, _getStoredChannel8, messageResponse, messageUpdateData, messageToUpdate, resolvedLastMessage, channelUpdateParam, _channel5, isErrorResendable, _t4;
+  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, parsedChannel, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, _getStoredChannel8, messageResponse, messageUpdateData, messageToUpdate, resolvedLastMessage, channelUpdateParam, _channel5, isErrorResendable, _t4;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -16686,12 +16688,12 @@ function forwardMessage(action) {
       case 2:
         channel = _context15.v;
         if (channel) {
-          _context15.n = 5;
+          _context15.n = 7;
           break;
         }
         channel = getChannelFromAllChannels(channelId) || null;
         if (channel) {
-          _context15.n = 4;
+          _context15.n = 5;
           break;
         }
         _SceytChatClient = getClient();
@@ -16699,26 +16701,37 @@ function forwardMessage(action) {
         return effects.call(_SceytChatClient.getChannel, channelId);
       case 3:
         channel = _context15.v;
-      case 4:
-        if (channel) {
-          setChannelInMap(channel);
+        if (!channel) {
+          _context15.n = 4;
+          break;
         }
+        setChannelInMap(channel);
+        addChannelToAllChannels(_extends({}, channel));
+        parsedChannel = JSON.parse(JSON.stringify(channel));
+        _context15.n = 4;
+        return effects.put(addChannelAC(parsedChannel));
+      case 4:
+        _context15.n = 6;
+        break;
+      case 5:
+        setChannelInMap(channel);
+      case 6:
         if (!channel) {
           channel = getChannelFromAllChannelsMap(channelId);
         }
-      case 5:
+      case 7:
         if (channel) {
-          _context15.n = 6;
+          _context15.n = 8;
           break;
         }
         throw new Error('Channel not found');
-      case 6:
+      case 8:
         mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         attachments = message.attachments;
         if ((channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC) && !(channel.userRole === 'admin' || channel.userRole === 'owner')) {
-          _context15.n = 15;
+          _context15.n = 17;
           break;
         }
         if (message.attachments && message.attachments.length && action.type !== RESEND_MESSAGE) {
@@ -16766,51 +16779,51 @@ function forwardMessage(action) {
           pendingMessage.forwardingDetails.hops = message.forwardingDetails ? message.forwardingDetails.hops : 1;
         }
         if (!pendingMessage) {
-          _context15.n = 8;
+          _context15.n = 10;
           break;
         }
         if (!(action.type !== RESEND_MESSAGE)) {
-          _context15.n = 8;
+          _context15.n = 10;
           break;
         }
-        _context15.n = 7;
+        _context15.n = 9;
         return effects.call(loadOGMetadataForLinkMessages, [pendingMessage], true);
-      case 7:
-        _context15.n = 8;
+      case 9:
+        _context15.n = 10;
         return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, channelId === activeChannelId, message, isNotShowOwnMessageForward);
-      case 8:
+      case 10:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context15.n = 14;
+          _context15.n = 16;
           break;
         }
-        _context15.n = 9;
+        _context15.n = 11;
         return effects.call(channel.sendMessage, _extends({}, messageToSend, isNotShowOwnMessageForward ? {
           forwardingDetails: null
         } : {}));
-      case 9:
+      case 11:
         messageResponse = _context15.v;
         messageUpdateData = _extends({}, messageResponse, {
           channelId: channel.id
         });
         if (!(channelId === activeChannelId)) {
-          _context15.n = 10;
+          _context15.n = 12;
           break;
         }
-        _context15.n = 10;
+        _context15.n = 12;
         return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
-      case 10:
+      case 12:
         addConfirmedMessageToCache(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         if (!channel.unread) {
-          _context15.n = 11;
+          _context15.n = 13;
           break;
         }
-        _context15.n = 11;
+        _context15.n = 13;
         return effects.put(markChannelAsReadAC(channel.id));
-      case 11:
+      case 13:
         resolvedLastMessage = getResolvedChannelLastMessage(channel.id, messageToUpdate, messageToSend);
         if (!lastMessageNeedsUpdate((_getStoredChannel8 = getStoredChannel(channel.id)) === null || _getStoredChannel8 === void 0 ? void 0 : _getStoredChannel8.lastMessage, resolvedLastMessage)) {
-          _context15.n = 13;
+          _context15.n = 15;
           break;
         }
         updateChannelLastMessageOnAllChannels(channel.id, resolvedLastMessage);
@@ -16818,36 +16831,36 @@ function forwardMessage(action) {
           lastMessage: resolvedLastMessage,
           lastReactedMessage: null
         };
-        _context15.n = 12;
-        return effects.put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 12:
-        updateChannelOnAllChannels(channel.id, channelUpdateParam);
-      case 13:
-        _context15.n = 15;
-        break;
+        _context15.n = 14;
+        return effects.put(updateChannelDataAC(channel.id, _extends({}, channel, channelUpdateParam), true, false, true));
       case 14:
-        throw new Error('Connection required to forward message');
+        updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 15:
-        _context15.n = 18;
+        _context15.n = 17;
         break;
       case 16:
-        _context15.p = 16;
+        throw new Error('Connection required to forward message');
+      case 17:
+        _context15.n = 20;
+        break;
+      case 18:
+        _context15.p = 18;
         _t4 = _context15.v;
         isErrorResendable = isResendableError(_t4 === null || _t4 === void 0 ? void 0 : _t4.type);
         if (!((_channel5 = channel) !== null && _channel5 !== void 0 && _channel5.id && messageTid)) {
-          _context15.n = 17;
+          _context15.n = 19;
           break;
         }
-        _context15.n = 17;
+        _context15.n = 19;
         return effects.call(syncFailedMessageState, channel, messageTid, pendingMessage || _extends({}, message, {
           tid: messageTid
         }), isErrorResendable);
-      case 17:
+      case 19:
         log.error('error on forward message ... ', _t4);
-      case 18:
+      case 20:
         return _context15.a(2);
     }
-  }, _marked11, null, [[1, 16]]);
+  }, _marked11, null, [[1, 18]]);
 }
 function resendMessage(action) {
   var _message$attachments;
@@ -44139,6 +44152,7 @@ function useChatController(_ref5) {
   var viewIsAtLatestRef = React.useRef(true);
   var jumpLockUntilRef = React.useRef(0);
   var jumpLockModeRef = React.useRef(null);
+  var jumpLockHighWaterMarkRef = React.useRef(0);
   var jumpUnlockTimeoutRef = React.useRef(null);
   var isJumping = React.useRef(false);
   var currentJumpIdRef = React.useRef(0);
@@ -44345,6 +44359,7 @@ function useChatController(_ref5) {
   var clearJumpScrollingLock = React.useCallback(function () {
     jumpLockUntilRef.current = 0;
     jumpLockModeRef.current = null;
+    jumpLockHighWaterMarkRef.current = 0;
     historyLoadArmedRef.current = true;
     latestLoadArmedRef.current = true;
     if (historyArmTimerRef.current !== null) {
@@ -44362,9 +44377,11 @@ function useChatController(_ref5) {
     isJumping.current = false;
   }, []);
   var lockJumpScrolling = React.useCallback(function (smooth, mode) {
+    var _scrollRef$current$sc, _scrollRef$current;
     var lockDuration = smooth ? JUMP_SCROLL_LOCK_MS : 250;
     jumpLockUntilRef.current = Date.now() + lockDuration;
     jumpLockModeRef.current = mode;
+    jumpLockHighWaterMarkRef.current = (_scrollRef$current$sc = (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollTop) != null ? _scrollRef$current$sc : 0;
     if (jumpUnlockTimeoutRef.current !== null) {
       clearTimeout(jumpUnlockTimeoutRef.current);
     }
@@ -45127,7 +45144,8 @@ function useChatController(_ref5) {
     if (isJumping.current) {
       return;
     }
-    if (currentScrollTop <= historyEdgeScrollTop + PRELOAD_TRIGGER_PX) {
+    var jumpLockActive = Date.now() < jumpLockUntilRef.current;
+    if (!jumpLockActive && currentScrollTop <= historyEdgeScrollTop + PRELOAD_TRIGGER_PX) {
       currentScrollTop = historyEdgeScrollTop;
     }
     if (currentScrollTop !== container.scrollTop) {
@@ -45135,9 +45153,14 @@ function useChatController(_ref5) {
     }
     var distanceFromLatest = latestEdgeScrollTop - currentScrollTop;
     lastMeasuredLatestEdgeRef.current = latestEdgeScrollTop;
-    if (Date.now() < jumpLockUntilRef.current) {
+    if (jumpLockActive) {
+      jumpLockHighWaterMarkRef.current = Math.max(jumpLockHighWaterMarkRef.current, currentScrollTop);
       if (jumpLockModeRef.current === 'latest' && distanceFromLatest > PRELOAD_RESET_PX) {
-        clearJumpScrollingLock();
+        if (currentScrollTop < jumpLockHighWaterMarkRef.current - PRELOAD_RESET_PX) {
+          clearJumpScrollingLock();
+        } else {
+          return;
+        }
       } else {
         return;
       }
@@ -45386,12 +45409,12 @@ function useChatController(_ref5) {
   }, [channel.id, clearScrollIdleTimer, dispatch]);
   var departingChannelId = activeChannelIdRef.current;
   if (departingChannelId) {
-    var _scrollRef$current$sc, _scrollRef$current;
+    var _scrollRef$current$sc2, _scrollRef$current2;
     var currentMessages = messagesRef.current;
     var startId = getFirstConfirmedMessageId(currentMessages);
     var endId = getLastConfirmedMessageId(currentMessages);
     var anchorId = lastVisibleAnchorIdRef.current;
-    var scrollTop = (_scrollRef$current$sc = (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollTop) != null ? _scrollRef$current$sc : 0;
+    var scrollTop = (_scrollRef$current$sc2 = (_scrollRef$current2 = scrollRef.current) === null || _scrollRef$current2 === void 0 ? void 0 : _scrollRef$current2.scrollTop) != null ? _scrollRef$current$sc2 : 0;
     if (startId && endId && anchorId) {
       var confirmedMessages = currentMessages.filter(function (m) {
         return !!m.id;
@@ -45822,16 +45845,6 @@ function useChatController(_ref5) {
       return m.sortKey === latestLocalRef || m.localRef === latestLocalRef;
     });
     var shouldShow = !isLatestInView || !isViewingLatest && (pendingNewestCount > 0 || !!scrollToMentionedMessage);
-    console.log('[scrollToNewMsg]', {
-      latestLocalRef: latestLocalRef,
-      isLatestInView: !!isLatestInView,
-      isViewingLatest: isViewingLatest,
-      pendingNewestCount: pendingNewestCount,
-      scrollToMentionedMessage: scrollToMentionedMessage,
-      shouldShow: shouldShow,
-      showScrollToNewMessageButton: showScrollToNewMessageButton,
-      latestVisibleMessages: latestVisibleMessages
-    });
     if (showScrollToNewMessageButton !== shouldShow) {
       dispatch(showScrollToNewMessageButtonAC(shouldShow));
     }

package/index.modern.js

@@ -9288,7 +9288,8 @@ var channelSlice = createSlice({
         config = _action$payload3.config,
         channelId = _action$payload3.channelId,
         moveUp = _action$payload3.moveUp,
-        sort = _action$payload3.sort;
+        sort = _action$payload3.sort,
+        add = _action$payload3.add;
       if (moveUp) {
         var updateChannel;
         var updatedChannels = state.channels.filter(function (chan) {
@@ -9297,8 +9298,8 @@ var channelSlice = createSlice({
           }
           return chan.id !== channelId;
         });
-        if (updateChannel) {
-          updateChannel = _extends({}, updateChannel, config);
+        if (updateChannel || add) {
+          updateChannel = _extends({}, updateChannel || {}, config);
           state.channels = sortChannelByLastMessage([updateChannel].concat(updatedChannels));
         }
       } else {
@@ -13564,12 +13565,13 @@ var updateChannelAC = function updateChannelAC(channelId, config) {
     }
   };
 };
-var updateChannelDataAC = function updateChannelDataAC(channelId, config, moveUp, sort) {
+var updateChannelDataAC = function updateChannelDataAC(channelId, config, moveUp, sort, add) {
   return updateChannelData({
     config: config,
     channelId: channelId,
     moveUp: moveUp,
-    sort: sort
+    sort: sort,
+    add: add
   });
 };
 var updateChannelsMembersAC = function updateChannelsMembersAC(members) {
@@ -16666,7 +16668,7 @@ function sendTextMessage(action) {
 }
 function forwardMessage(action) {
   var _message$user;
-  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, _getStoredChannel8, messageResponse, messageUpdateData, messageToUpdate, resolvedLastMessage, channelUpdateParam, _channel5, isErrorResendable, _t4;
+  var payload, message, channelId, connectionState, isForward, showOwnMessageForward, SceytChatClient, isNotShowOwnMessageForward, pendingMessage, channel, activeChannelId, messageTid, _SceytChatClient, parsedChannel, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, pollDetails, messageToSend, _getStoredChannel8, messageResponse, messageUpdateData, messageToUpdate, resolvedLastMessage, channelUpdateParam, _channel5, isErrorResendable, _t4;
   return _regenerator().w(function (_context15) {
     while (1) switch (_context15.p = _context15.n) {
       case 0:
@@ -16685,12 +16687,12 @@ function forwardMessage(action) {
       case 2:
         channel = _context15.v;
         if (channel) {
-          _context15.n = 5;
+          _context15.n = 7;
           break;
         }
         channel = getChannelFromAllChannels(channelId) || null;
         if (channel) {
-          _context15.n = 4;
+          _context15.n = 5;
           break;
         }
         _SceytChatClient = getClient();
@@ -16698,26 +16700,37 @@ function forwardMessage(action) {
         return call(_SceytChatClient.getChannel, channelId);
       case 3:
         channel = _context15.v;
-      case 4:
-        if (channel) {
-          setChannelInMap(channel);
+        if (!channel) {
+          _context15.n = 4;
+          break;
         }
+        setChannelInMap(channel);
+        addChannelToAllChannels(_extends({}, channel));
+        parsedChannel = JSON.parse(JSON.stringify(channel));
+        _context15.n = 4;
+        return put(addChannelAC(parsedChannel));
+      case 4:
+        _context15.n = 6;
+        break;
+      case 5:
+        setChannelInMap(channel);
+      case 6:
         if (!channel) {
           channel = getChannelFromAllChannelsMap(channelId);
         }
-      case 5:
+      case 7:
         if (channel) {
-          _context15.n = 6;
+          _context15.n = 8;
           break;
         }
         throw new Error('Channel not found');
-      case 6:
+      case 8:
         mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         attachments = message.attachments;
         if ((channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC) && !(channel.userRole === 'admin' || channel.userRole === 'owner')) {
-          _context15.n = 15;
+          _context15.n = 17;
           break;
         }
         if (message.attachments && message.attachments.length && action.type !== RESEND_MESSAGE) {
@@ -16765,51 +16778,51 @@ function forwardMessage(action) {
           pendingMessage.forwardingDetails.hops = message.forwardingDetails ? message.forwardingDetails.hops : 1;
         }
         if (!pendingMessage) {
-          _context15.n = 8;
+          _context15.n = 10;
           break;
         }
         if (!(action.type !== RESEND_MESSAGE)) {
-          _context15.n = 8;
+          _context15.n = 10;
           break;
         }
-        _context15.n = 7;
+        _context15.n = 9;
         return call(loadOGMetadataForLinkMessages, [pendingMessage], true);
-      case 7:
-        _context15.n = 8;
+      case 9:
+        _context15.n = 10;
         return call(updateMessage$1, action.type, pendingMessage, channel.id, channelId === activeChannelId, message, isNotShowOwnMessageForward);
-      case 8:
+      case 10:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context15.n = 14;
+          _context15.n = 16;
           break;
         }
-        _context15.n = 9;
+        _context15.n = 11;
         return call(channel.sendMessage, _extends({}, messageToSend, isNotShowOwnMessageForward ? {
           forwardingDetails: null
         } : {}));
-      case 9:
+      case 11:
         messageResponse = _context15.v;
         messageUpdateData = _extends({}, messageResponse, {
           channelId: channel.id
         });
         if (!(channelId === activeChannelId)) {
-          _context15.n = 10;
+          _context15.n = 12;
           break;
         }
-        _context15.n = 10;
+        _context15.n = 12;
         return put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
-      case 10:
+      case 12:
         addConfirmedMessageToCache(channel.id, JSON.parse(JSON.stringify(messageUpdateData)));
         messageToUpdate = JSON.parse(JSON.stringify(messageResponse));
         if (!channel.unread) {
-          _context15.n = 11;
+          _context15.n = 13;
           break;
         }
-        _context15.n = 11;
+        _context15.n = 13;
         return put(markChannelAsReadAC(channel.id));
-      case 11:
+      case 13:
         resolvedLastMessage = getResolvedChannelLastMessage(channel.id, messageToUpdate, messageToSend);
         if (!lastMessageNeedsUpdate((_getStoredChannel8 = getStoredChannel(channel.id)) === null || _getStoredChannel8 === void 0 ? void 0 : _getStoredChannel8.lastMessage, resolvedLastMessage)) {
-          _context15.n = 13;
+          _context15.n = 15;
           break;
         }
         updateChannelLastMessageOnAllChannels(channel.id, resolvedLastMessage);
@@ -16817,36 +16830,36 @@ function forwardMessage(action) {
           lastMessage: resolvedLastMessage,
           lastReactedMessage: null
         };
-        _context15.n = 12;
-        return put(updateChannelDataAC(channel.id, channelUpdateParam, true));
-      case 12:
-        updateChannelOnAllChannels(channel.id, channelUpdateParam);
-      case 13:
-        _context15.n = 15;
-        break;
+        _context15.n = 14;
+        return put(updateChannelDataAC(channel.id, _extends({}, channel, channelUpdateParam), true, false, true));
       case 14:
-        throw new Error('Connection required to forward message');
+        updateChannelOnAllChannels(channel.id, channelUpdateParam);
       case 15:
-        _context15.n = 18;
+        _context15.n = 17;
         break;
       case 16:
-        _context15.p = 16;
+        throw new Error('Connection required to forward message');
+      case 17:
+        _context15.n = 20;
+        break;
+      case 18:
+        _context15.p = 18;
         _t4 = _context15.v;
         isErrorResendable = isResendableError(_t4 === null || _t4 === void 0 ? void 0 : _t4.type);
         if (!((_channel5 = channel) !== null && _channel5 !== void 0 && _channel5.id && messageTid)) {
-          _context15.n = 17;
+          _context15.n = 19;
           break;
         }
-        _context15.n = 17;
+        _context15.n = 19;
         return call(syncFailedMessageState, channel, messageTid, pendingMessage || _extends({}, message, {
           tid: messageTid
         }), isErrorResendable);
-      case 17:
+      case 19:
         log.error('error on forward message ... ', _t4);
-      case 18:
+      case 20:
         return _context15.a(2);
     }
-  }, _marked11, null, [[1, 16]]);
+  }, _marked11, null, [[1, 18]]);
 }
 function resendMessage(action) {
   var _message$attachments;
@@ -44138,6 +44151,7 @@ function useChatController(_ref5) {
   var viewIsAtLatestRef = useRef(true);
   var jumpLockUntilRef = useRef(0);
   var jumpLockModeRef = useRef(null);
+  var jumpLockHighWaterMarkRef = useRef(0);
   var jumpUnlockTimeoutRef = useRef(null);
   var isJumping = useRef(false);
   var currentJumpIdRef = useRef(0);
@@ -44344,6 +44358,7 @@ function useChatController(_ref5) {
   var clearJumpScrollingLock = useCallback(function () {
     jumpLockUntilRef.current = 0;
     jumpLockModeRef.current = null;
+    jumpLockHighWaterMarkRef.current = 0;
     historyLoadArmedRef.current = true;
     latestLoadArmedRef.current = true;
     if (historyArmTimerRef.current !== null) {
@@ -44361,9 +44376,11 @@ function useChatController(_ref5) {
     isJumping.current = false;
   }, []);
   var lockJumpScrolling = useCallback(function (smooth, mode) {
+    var _scrollRef$current$sc, _scrollRef$current;
     var lockDuration = smooth ? JUMP_SCROLL_LOCK_MS : 250;
     jumpLockUntilRef.current = Date.now() + lockDuration;
     jumpLockModeRef.current = mode;
+    jumpLockHighWaterMarkRef.current = (_scrollRef$current$sc = (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollTop) != null ? _scrollRef$current$sc : 0;
     if (jumpUnlockTimeoutRef.current !== null) {
       clearTimeout(jumpUnlockTimeoutRef.current);
     }
@@ -45126,7 +45143,8 @@ function useChatController(_ref5) {
     if (isJumping.current) {
       return;
     }
-    if (currentScrollTop <= historyEdgeScrollTop + PRELOAD_TRIGGER_PX) {
+    var jumpLockActive = Date.now() < jumpLockUntilRef.current;
+    if (!jumpLockActive && currentScrollTop <= historyEdgeScrollTop + PRELOAD_TRIGGER_PX) {
       currentScrollTop = historyEdgeScrollTop;
     }
     if (currentScrollTop !== container.scrollTop) {
@@ -45134,9 +45152,14 @@ function useChatController(_ref5) {
     }
     var distanceFromLatest = latestEdgeScrollTop - currentScrollTop;
     lastMeasuredLatestEdgeRef.current = latestEdgeScrollTop;
-    if (Date.now() < jumpLockUntilRef.current) {
+    if (jumpLockActive) {
+      jumpLockHighWaterMarkRef.current = Math.max(jumpLockHighWaterMarkRef.current, currentScrollTop);
       if (jumpLockModeRef.current === 'latest' && distanceFromLatest > PRELOAD_RESET_PX) {
-        clearJumpScrollingLock();
+        if (currentScrollTop < jumpLockHighWaterMarkRef.current - PRELOAD_RESET_PX) {
+          clearJumpScrollingLock();
+        } else {
+          return;
+        }
       } else {
         return;
       }
@@ -45385,12 +45408,12 @@ function useChatController(_ref5) {
   }, [channel.id, clearScrollIdleTimer, dispatch]);
   var departingChannelId = activeChannelIdRef.current;
   if (departingChannelId) {
-    var _scrollRef$current$sc, _scrollRef$current;
+    var _scrollRef$current$sc2, _scrollRef$current2;
     var currentMessages = messagesRef.current;
     var startId = getFirstConfirmedMessageId(currentMessages);
     var endId = getLastConfirmedMessageId(currentMessages);
     var anchorId = lastVisibleAnchorIdRef.current;
-    var scrollTop = (_scrollRef$current$sc = (_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollTop) != null ? _scrollRef$current$sc : 0;
+    var scrollTop = (_scrollRef$current$sc2 = (_scrollRef$current2 = scrollRef.current) === null || _scrollRef$current2 === void 0 ? void 0 : _scrollRef$current2.scrollTop) != null ? _scrollRef$current$sc2 : 0;
     if (startId && endId && anchorId) {
       var confirmedMessages = currentMessages.filter(function (m) {
         return !!m.id;
@@ -45821,16 +45844,6 @@ function useChatController(_ref5) {
       return m.sortKey === latestLocalRef || m.localRef === latestLocalRef;
     });
     var shouldShow = !isLatestInView || !isViewingLatest && (pendingNewestCount > 0 || !!scrollToMentionedMessage);
-    console.log('[scrollToNewMsg]', {
-      latestLocalRef: latestLocalRef,
-      isLatestInView: !!isLatestInView,
-      isViewingLatest: isViewingLatest,
-      pendingNewestCount: pendingNewestCount,
-      scrollToMentionedMessage: scrollToMentionedMessage,
-      shouldShow: shouldShow,
-      showScrollToNewMessageButton: showScrollToNewMessageButton,
-      latestVisibleMessages: latestVisibleMessages
-    });
     if (showScrollToNewMessageButton !== shouldShow) {
       dispatch(showScrollToNewMessageButtonAC(shouldShow));
     }

package/package.json

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