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

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;
@@ -20930,7 +20943,7 @@ function loadMorePollVotes(action) {
 }
 var REFRESH_WINDOW_HALF = 30;
 function refreshCacheAroundMessage(action) {
-  var _action$payload0, channelId, messageId, _action$payload0$appl, applyVisibleWindow, connectionState, activeChannelId, activeMessages, activeConfirmedMessages, centerMessageIndex, refreshAnchorId, previousLimit, nextLimit, SceytChatClient, messageQueryBuilder, messageQuery, prevResult, pivotId, nextResult, loadedMessages, firstId, lastId, activeById, changed, filteredPendingMessages, _t53, _t54, _t55;
+  var _action$payload0, channelId, messageId, _action$payload0$appl, applyVisibleWindow, connectionState, activeChannelId, activeMessages, activeConfirmedMessages, centerMessageIndex, refreshAnchorId, previousLimit, nextLimit, SceytChatClient, messageQueryBuilder, messageQuery, prevResult, pivotId, nextResult, loadedMessages, firstId, lastId, currentActiveMessages, currentActiveConfirmedMessages, activeById, changed, filteredPendingMessages, _t53, _t54, _t55;
   return _regenerator().w(function (_context63) {
     while (1) switch (_context63.p = _context63.n) {
       case 0:
@@ -21032,8 +21045,18 @@ function refreshCacheAroundMessage(action) {
         _context63.n = 13;
         return effects.call(loadOGMetadataForLinkMessages, loadedMessages, true);
       case 13:
+        currentActiveMessages = store.getState().MessageReducer.activeChannelMessages || [];
+        currentActiveConfirmedMessages = currentActiveMessages.filter(function (message) {
+          return !!message.id;
+        });
+        if (sameConfirmedWindow(currentActiveConfirmedMessages, activeConfirmedMessages)) {
+          _context63.n = 14;
+          break;
+        }
+        return _context63.a(2);
+      case 14:
         if (!sameConfirmedWindow(activeConfirmedMessages, loadedMessages)) {
-          _context63.n = 15;
+          _context63.n = 16;
           break;
         }
         activeById = new Map(activeConfirmedMessages.map(function (currentMessage) {
@@ -21046,44 +21069,44 @@ function refreshCacheAroundMessage(action) {
           return JSON.stringify(existing) !== JSON.stringify(loaded);
         });
         if (!(changed.length > 0)) {
-          _context63.n = 14;
+          _context63.n = 15;
           break;
         }
-        _context63.n = 14;
+        _context63.n = 15;
         return effects.put(patchMessagesAC(changed));
-      case 14:
-        return _context63.a(2);
       case 15:
+        return _context63.a(2);
+      case 16:
         if (applyVisibleWindow) {
-          _context63.n = 16;
+          _context63.n = 17;
           break;
         }
         return _context63.a(2);
-      case 16:
-        _context63.n = 17;
-        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(loadedMessages)), channelId));
       case 17:
+        _context63.n = 18;
+        return effects.put(setMessagesAC(JSON.parse(JSON.stringify(loadedMessages)), channelId));
+      case 18:
         filteredPendingMessages = getFilteredPendingMessages(channelId, loadedMessages);
         if (!(filteredPendingMessages.length > 0)) {
-          _context63.n = 19;
+          _context63.n = 20;
           break;
         }
-        _context63.n = 18;
-        return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 18:
         _context63.n = 19;
-        return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true);
+        return effects.put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 19:
-        _context63.n = 21;
-        break;
+        _context63.n = 20;
+        return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true);
       case 20:
-        _context63.p = 20;
+        _context63.n = 22;
+        break;
+      case 21:
+        _context63.p = 21;
         _t55 = _context63.v;
         log.error('error in refreshCacheAroundMessage', _t55);
-      case 21:
+      case 22:
         return _context63.a(2);
     }
-  }, _marked57, null, [[0, 20]]);
+  }, _marked57, null, [[0, 21]]);
 }
 function MessageSaga() {
   return _regenerator().w(function (_context64) {
@@ -21976,6 +21999,42 @@ var MessageStatusIcon = function MessageStatusIcon(_ref) {
       });
   }
 };
+function extractUrlMatches(text) {
+  var results = [];
+  var protocolRegex = /https?:\/\/\S+/g;
+  var m;
+  while ((m = protocolRegex.exec(text)) !== null) {
+    results.push({
+      text: m[0],
+      url: m[0],
+      index: m.index
+    });
+  }
+  var linkifyResults = new LinkifyIt().match(text);
+  if (linkifyResults) {
+    for (var _iterator = _createForOfIteratorHelperLoose(linkifyResults), _step; !(_step = _iterator()).done;) {
+      var lm = _step.value;
+      if (lm.schema === '') {
+        results.push({
+          text: lm.text,
+          url: lm.url.replace(/^http:\/\//, 'https://'),
+          index: lm.index
+        });
+      }
+    }
+  }
+  results.sort(function (a, b) {
+    return a.index - b.index;
+  });
+  return results.length > 0 ? results.map(function (_ref2) {
+    var text = _ref2.text,
+      url = _ref2.url;
+    return {
+      text: text,
+      url: url
+    };
+  }) : null;
+}
 var linkifyTextPart = function linkifyTextPart(textPart, match, target, isInviteLink, onInviteLinkClick) {
   if (target === void 0) {
     target = '_blank';
@@ -22024,26 +22083,25 @@ var linkifyTextPart = function linkifyTextPart(textPart, match, target, isInvite
   });
   return newMessageText || textPart;
 };
-var MessageTextFormat = function MessageTextFormat(_ref2) {
-  var text = _ref2.text,
-    message = _ref2.message,
-    contactsMap = _ref2.contactsMap,
-    getFromContacts = _ref2.getFromContacts,
-    isLastMessage = _ref2.isLastMessage,
-    asSampleText = _ref2.asSampleText,
-    accentColor = _ref2.accentColor,
-    textSecondary = _ref2.textSecondary,
-    onMentionNameClick = _ref2.onMentionNameClick,
-    shouldOpenUserProfileForMention = _ref2.shouldOpenUserProfileForMention,
-    unsupportedMessage = _ref2.unsupportedMessage,
-    _ref2$target = _ref2.target,
-    target = _ref2$target === void 0 ? '_blank' : _ref2$target,
-    _ref2$isInviteLink = _ref2.isInviteLink,
-    isInviteLink = _ref2$isInviteLink === void 0 ? false : _ref2$isInviteLink,
-    onInviteLinkClick = _ref2.onInviteLinkClick;
+var MessageTextFormat = function MessageTextFormat(_ref3) {
+  var text = _ref3.text,
+    message = _ref3.message,
+    contactsMap = _ref3.contactsMap,
+    getFromContacts = _ref3.getFromContacts,
+    isLastMessage = _ref3.isLastMessage,
+    asSampleText = _ref3.asSampleText,
+    accentColor = _ref3.accentColor,
+    textSecondary = _ref3.textSecondary,
+    onMentionNameClick = _ref3.onMentionNameClick,
+    shouldOpenUserProfileForMention = _ref3.shouldOpenUserProfileForMention,
+    unsupportedMessage = _ref3.unsupportedMessage,
+    _ref3$target = _ref3.target,
+    target = _ref3$target === void 0 ? '_blank' : _ref3$target,
+    _ref3$isInviteLink = _ref3.isInviteLink,
+    isInviteLink = _ref3$isInviteLink === void 0 ? false : _ref3$isInviteLink,
+    onInviteLinkClick = _ref3.onInviteLinkClick;
   try {
     var messageText = [];
-    var linkify = new LinkifyIt();
     var messageBodyAttributes = message.bodyAttributes && JSON.parse(JSON.stringify(message.bodyAttributes));
     if (unsupportedMessage) {
       return 'This message is not supported. Update your app to view this message.';
@@ -22056,12 +22114,12 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
         var attributeOffset = attribute.offset;
         try {
           var firstPart = "" + (textPart ? textPart === null || textPart === void 0 ? void 0 : textPart.substring(nextPartIndex || 0, attributeOffset) : '');
-          var firstPartMatch = firstPart ? linkify.match(firstPart) : '';
+          var firstPartMatch = firstPart ? extractUrlMatches(firstPart) : null;
           if (!isLastMessage && !asSampleText && firstPartMatch) {
             firstPart = linkifyTextPart(firstPart, firstPartMatch, target, isInviteLink, onInviteLinkClick);
           }
           var secondPart = "" + (textPart ? textPart === null || textPart === void 0 ? void 0 : textPart.substring(attributeOffset + attribute.length) : '');
-          var secondPartMatch = secondPart ? linkify.match(secondPart) : '';
+          var secondPartMatch = secondPart ? extractUrlMatches(secondPart) : null;
           if (!isLastMessage && !asSampleText && secondPartMatch) {
             secondPart = linkifyTextPart(secondPart, secondPartMatch, target, isInviteLink, onInviteLinkClick);
           }
@@ -22121,7 +22179,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
           } else {
             nextPartIndex = attributeOffset + attribute.length;
             var _textPart = "" + text.slice(attributeOffset, attributeOffset + attribute.length);
-            var match = linkify.match(_textPart);
+            var match = extractUrlMatches(_textPart);
             var newTextPart = _textPart;
             if (!isLastMessage && !asSampleText && match) {
               newTextPart = linkifyTextPart(_textPart, match, target, isInviteLink, onInviteLinkClick);
@@ -22138,7 +22196,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
         }
       });
     } else {
-      var match = linkify.match(text);
+      var match = extractUrlMatches(text);
       if (!isLastMessage && !asSampleText && match) {
         messageText = linkifyTextPart(text, match, target, isInviteLink, onInviteLinkClick);
       }
@@ -44139,6 +44197,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 +44404,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 +44422,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);
     }
@@ -44653,6 +44715,7 @@ function useChatController(_ref5) {
       restoreRef.current = null;
       pendingNewestCountRef.current = 0;
       setPendingNewestCount(0);
+      unreadRestoreCompletedRef.current = true;
       var container = scrollRef.current;
       var currentChannelId = (_channelRef$current = channelRef.current) === null || _channelRef$current === void 0 ? void 0 : _channelRef$current.id;
       var pendingLatestServerSync = ((_pendingLatestJumpRef = pendingLatestJumpRef.current) === null || _pendingLatestJumpRef === void 0 ? void 0 : _pendingLatestJumpRef.channelId) === currentChannelId && ((_pendingLatestJumpRef2 = pendingLatestJumpRef.current) === null || _pendingLatestJumpRef2 === void 0 ? void 0 : _pendingLatestJumpRef2.needsServerSync);
@@ -45127,7 +45190,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 +45199,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 +45455,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;
@@ -45513,6 +45582,7 @@ function useChatController(_ref5) {
       restoreRef.current = null;
       viewIsAtLatestRef.current = true;
       setIsViewingLatest(true);
+      lockJumpScrolling(true, 'latest');
       scrollToLatestEdge(container, 'smooth');
       rememberLatestEdge();
       return;
@@ -45573,7 +45643,7 @@ function useChatController(_ref5) {
       }
       rememberLatestEdge();
     }
-  }, [channel.id, unreadMessageId, isActiveEdgeRequestCurrent, dispatch, messages, unreadScrollTo, clearJumpBlur, hasNext, isScrollInteractionActive]);
+  }, [channel.id, unreadMessageId, isActiveEdgeRequestCurrent, dispatch, messages, unreadScrollTo, clearJumpBlur, hasNext, isScrollInteractionActive, lockJumpScrolling]);
   React.useEffect(function () {
     if (!unreadScrollTo || !unreadMessageId || !messages.length || unreadRestoreCompletedRef.current) {
       return;
@@ -45822,16 +45892,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));
     }
@@ -50738,10 +50798,10 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     editorState.read(function () {
       var root = lexical.$getRoot();
       var textContent = root.getTextContent();
-      var matches = linkify.match(textContent);
-      if (matches && matches.length > 0) {
-        var rawUrl = matches[0].url;
-        var firstUrl = matches[0].schema === '' ? rawUrl.replace(/^http:\/\//, 'https://') : rawUrl;
+      var protocolMatch = /https?:\/\/\S+/.exec(textContent);
+      var linkifyMatchResult = !protocolMatch ? linkify.match(textContent) : null;
+      var firstUrl = protocolMatch ? protocolMatch[0] : linkifyMatchResult !== null && linkifyMatchResult !== void 0 && linkifyMatchResult[0] ? linkifyMatchResult[0].schema === '' ? linkifyMatchResult[0].url.replace(/^http:\/\//, 'https://') : linkifyMatchResult[0].url : null;
+      if (firstUrl) {
         if (firstUrl !== detectedUrl) {
           closePreviewWithAnimation(function () {
             if (!dismissedUrls.has(firstUrl)) {
@@ -50901,11 +50961,11 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         }
         var linkAttachment;
         if (messageTexToSend) {
-          var _linkify = new LinkifyIt();
-          var match = _linkify.match(messageTexToSend);
-          if (match) {
-            var rawUrl = match[0].url;
-            var url = match[0].schema === '' ? rawUrl.replace(/^http:\/\//, 'https://') : rawUrl;
+          var _LinkifyIt$match;
+          var protocolMatch = /https?:\/\/\S+/.exec(messageTexToSend);
+          var linkifyMatchResult = !protocolMatch ? (_LinkifyIt$match = new LinkifyIt().match(messageTexToSend)) === null || _LinkifyIt$match === void 0 ? void 0 : _LinkifyIt$match[0] : null;
+          var url = protocolMatch ? protocolMatch[0] : linkifyMatchResult ? linkifyMatchResult.schema === '' ? linkifyMatchResult.url.replace(/^http:\/\//, 'https://') : linkifyMatchResult.url : null;
+          if (url) {
             var urlMetadata = oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[url];
             var metadata = {};
             if (urlMetadata) {
@@ -51020,11 +51080,11 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (messageTexToSend) {
       var linkAttachment;
       if (messageTexToSend) {
-        var _linkify2 = new LinkifyIt();
-        var match = _linkify2.match(messageTexToSend);
-        if (match) {
-          var rawUrl = match[0].url;
-          var url = match[0].schema === '' ? rawUrl.replace(/^http:\/\//, 'https://') : rawUrl;
+        var _LinkifyIt$match2;
+        var protocolMatch = /https?:\/\/\S+/.exec(messageTexToSend);
+        var linkifyMatchResult = !protocolMatch ? (_LinkifyIt$match2 = new LinkifyIt().match(messageTexToSend)) === null || _LinkifyIt$match2 === void 0 ? void 0 : _LinkifyIt$match2[0] : null;
+        var url = protocolMatch ? protocolMatch[0] : linkifyMatchResult ? linkifyMatchResult.schema === '' ? linkifyMatchResult.url.replace(/^http:\/\//, 'https://') : linkifyMatchResult.url : null;
+        if (url) {
           var urlMetadata = oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[url];
           var metadata = {};
           if (urlMetadata) {
@@ -58005,6 +58065,7 @@ exports.SendMessage = SendMessageInput;
 exports.THEME_COLORS = THEME_COLORS;
 exports.blockUsers = blockUsers;
 exports.createOrGetDirectChannel = createOrGetDirectChannel;
+exports.extractUrlMatches = extractUrlMatches;
 exports.handleGetMessage = handleGetMessage;
 exports.handleSendMessage = handleSendMessage;
 exports.switchChannelActiveChannel = switchChannelActiveChannel;

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;
@@ -20929,7 +20942,7 @@ function loadMorePollVotes(action) {
 }
 var REFRESH_WINDOW_HALF = 30;
 function refreshCacheAroundMessage(action) {
-  var _action$payload0, channelId, messageId, _action$payload0$appl, applyVisibleWindow, connectionState, activeChannelId, activeMessages, activeConfirmedMessages, centerMessageIndex, refreshAnchorId, previousLimit, nextLimit, SceytChatClient, messageQueryBuilder, messageQuery, prevResult, pivotId, nextResult, loadedMessages, firstId, lastId, activeById, changed, filteredPendingMessages, _t53, _t54, _t55;
+  var _action$payload0, channelId, messageId, _action$payload0$appl, applyVisibleWindow, connectionState, activeChannelId, activeMessages, activeConfirmedMessages, centerMessageIndex, refreshAnchorId, previousLimit, nextLimit, SceytChatClient, messageQueryBuilder, messageQuery, prevResult, pivotId, nextResult, loadedMessages, firstId, lastId, currentActiveMessages, currentActiveConfirmedMessages, activeById, changed, filteredPendingMessages, _t53, _t54, _t55;
   return _regenerator().w(function (_context63) {
     while (1) switch (_context63.p = _context63.n) {
       case 0:
@@ -21031,8 +21044,18 @@ function refreshCacheAroundMessage(action) {
         _context63.n = 13;
         return call(loadOGMetadataForLinkMessages, loadedMessages, true);
       case 13:
+        currentActiveMessages = store.getState().MessageReducer.activeChannelMessages || [];
+        currentActiveConfirmedMessages = currentActiveMessages.filter(function (message) {
+          return !!message.id;
+        });
+        if (sameConfirmedWindow(currentActiveConfirmedMessages, activeConfirmedMessages)) {
+          _context63.n = 14;
+          break;
+        }
+        return _context63.a(2);
+      case 14:
         if (!sameConfirmedWindow(activeConfirmedMessages, loadedMessages)) {
-          _context63.n = 15;
+          _context63.n = 16;
           break;
         }
         activeById = new Map(activeConfirmedMessages.map(function (currentMessage) {
@@ -21045,44 +21068,44 @@ function refreshCacheAroundMessage(action) {
           return JSON.stringify(existing) !== JSON.stringify(loaded);
         });
         if (!(changed.length > 0)) {
-          _context63.n = 14;
+          _context63.n = 15;
           break;
         }
-        _context63.n = 14;
+        _context63.n = 15;
         return put(patchMessagesAC(changed));
-      case 14:
-        return _context63.a(2);
       case 15:
+        return _context63.a(2);
+      case 16:
         if (applyVisibleWindow) {
-          _context63.n = 16;
+          _context63.n = 17;
           break;
         }
         return _context63.a(2);
-      case 16:
-        _context63.n = 17;
-        return put(setMessagesAC(JSON.parse(JSON.stringify(loadedMessages)), channelId));
       case 17:
+        _context63.n = 18;
+        return put(setMessagesAC(JSON.parse(JSON.stringify(loadedMessages)), channelId));
+      case 18:
         filteredPendingMessages = getFilteredPendingMessages(channelId, loadedMessages);
         if (!(filteredPendingMessages.length > 0)) {
-          _context63.n = 19;
+          _context63.n = 20;
           break;
         }
-        _context63.n = 18;
-        return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
-      case 18:
         _context63.n = 19;
-        return call(loadOGMetadataForLinkMessages, filteredPendingMessages, true);
+        return put(addMessagesAC(filteredPendingMessages, MESSAGE_LOAD_DIRECTION.NEXT));
       case 19:
-        _context63.n = 21;
-        break;
+        _context63.n = 20;
+        return call(loadOGMetadataForLinkMessages, filteredPendingMessages, true);
       case 20:
-        _context63.p = 20;
+        _context63.n = 22;
+        break;
+      case 21:
+        _context63.p = 21;
         _t55 = _context63.v;
         log.error('error in refreshCacheAroundMessage', _t55);
-      case 21:
+      case 22:
         return _context63.a(2);
     }
-  }, _marked57, null, [[0, 20]]);
+  }, _marked57, null, [[0, 21]]);
 }
 function MessageSaga() {
   return _regenerator().w(function (_context64) {
@@ -21975,6 +21998,42 @@ var MessageStatusIcon = function MessageStatusIcon(_ref) {
       });
   }
 };
+function extractUrlMatches(text) {
+  var results = [];
+  var protocolRegex = /https?:\/\/\S+/g;
+  var m;
+  while ((m = protocolRegex.exec(text)) !== null) {
+    results.push({
+      text: m[0],
+      url: m[0],
+      index: m.index
+    });
+  }
+  var linkifyResults = new LinkifyIt().match(text);
+  if (linkifyResults) {
+    for (var _iterator = _createForOfIteratorHelperLoose(linkifyResults), _step; !(_step = _iterator()).done;) {
+      var lm = _step.value;
+      if (lm.schema === '') {
+        results.push({
+          text: lm.text,
+          url: lm.url.replace(/^http:\/\//, 'https://'),
+          index: lm.index
+        });
+      }
+    }
+  }
+  results.sort(function (a, b) {
+    return a.index - b.index;
+  });
+  return results.length > 0 ? results.map(function (_ref2) {
+    var text = _ref2.text,
+      url = _ref2.url;
+    return {
+      text: text,
+      url: url
+    };
+  }) : null;
+}
 var linkifyTextPart = function linkifyTextPart(textPart, match, target, isInviteLink, onInviteLinkClick) {
   if (target === void 0) {
     target = '_blank';
@@ -22023,26 +22082,25 @@ var linkifyTextPart = function linkifyTextPart(textPart, match, target, isInvite
   });
   return newMessageText || textPart;
 };
-var MessageTextFormat = function MessageTextFormat(_ref2) {
-  var text = _ref2.text,
-    message = _ref2.message,
-    contactsMap = _ref2.contactsMap,
-    getFromContacts = _ref2.getFromContacts,
-    isLastMessage = _ref2.isLastMessage,
-    asSampleText = _ref2.asSampleText,
-    accentColor = _ref2.accentColor,
-    textSecondary = _ref2.textSecondary,
-    onMentionNameClick = _ref2.onMentionNameClick,
-    shouldOpenUserProfileForMention = _ref2.shouldOpenUserProfileForMention,
-    unsupportedMessage = _ref2.unsupportedMessage,
-    _ref2$target = _ref2.target,
-    target = _ref2$target === void 0 ? '_blank' : _ref2$target,
-    _ref2$isInviteLink = _ref2.isInviteLink,
-    isInviteLink = _ref2$isInviteLink === void 0 ? false : _ref2$isInviteLink,
-    onInviteLinkClick = _ref2.onInviteLinkClick;
+var MessageTextFormat = function MessageTextFormat(_ref3) {
+  var text = _ref3.text,
+    message = _ref3.message,
+    contactsMap = _ref3.contactsMap,
+    getFromContacts = _ref3.getFromContacts,
+    isLastMessage = _ref3.isLastMessage,
+    asSampleText = _ref3.asSampleText,
+    accentColor = _ref3.accentColor,
+    textSecondary = _ref3.textSecondary,
+    onMentionNameClick = _ref3.onMentionNameClick,
+    shouldOpenUserProfileForMention = _ref3.shouldOpenUserProfileForMention,
+    unsupportedMessage = _ref3.unsupportedMessage,
+    _ref3$target = _ref3.target,
+    target = _ref3$target === void 0 ? '_blank' : _ref3$target,
+    _ref3$isInviteLink = _ref3.isInviteLink,
+    isInviteLink = _ref3$isInviteLink === void 0 ? false : _ref3$isInviteLink,
+    onInviteLinkClick = _ref3.onInviteLinkClick;
   try {
     var messageText = [];
-    var linkify = new LinkifyIt();
     var messageBodyAttributes = message.bodyAttributes && JSON.parse(JSON.stringify(message.bodyAttributes));
     if (unsupportedMessage) {
       return 'This message is not supported. Update your app to view this message.';
@@ -22055,12 +22113,12 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
         var attributeOffset = attribute.offset;
         try {
           var firstPart = "" + (textPart ? textPart === null || textPart === void 0 ? void 0 : textPart.substring(nextPartIndex || 0, attributeOffset) : '');
-          var firstPartMatch = firstPart ? linkify.match(firstPart) : '';
+          var firstPartMatch = firstPart ? extractUrlMatches(firstPart) : null;
           if (!isLastMessage && !asSampleText && firstPartMatch) {
             firstPart = linkifyTextPart(firstPart, firstPartMatch, target, isInviteLink, onInviteLinkClick);
           }
           var secondPart = "" + (textPart ? textPart === null || textPart === void 0 ? void 0 : textPart.substring(attributeOffset + attribute.length) : '');
-          var secondPartMatch = secondPart ? linkify.match(secondPart) : '';
+          var secondPartMatch = secondPart ? extractUrlMatches(secondPart) : null;
           if (!isLastMessage && !asSampleText && secondPartMatch) {
             secondPart = linkifyTextPart(secondPart, secondPartMatch, target, isInviteLink, onInviteLinkClick);
           }
@@ -22120,7 +22178,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
           } else {
             nextPartIndex = attributeOffset + attribute.length;
             var _textPart = "" + text.slice(attributeOffset, attributeOffset + attribute.length);
-            var match = linkify.match(_textPart);
+            var match = extractUrlMatches(_textPart);
             var newTextPart = _textPart;
             if (!isLastMessage && !asSampleText && match) {
               newTextPart = linkifyTextPart(_textPart, match, target, isInviteLink, onInviteLinkClick);
@@ -22137,7 +22195,7 @@ var MessageTextFormat = function MessageTextFormat(_ref2) {
         }
       });
     } else {
-      var match = linkify.match(text);
+      var match = extractUrlMatches(text);
       if (!isLastMessage && !asSampleText && match) {
         messageText = linkifyTextPart(text, match, target, isInviteLink, onInviteLinkClick);
       }
@@ -44138,6 +44196,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 +44403,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 +44421,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);
     }
@@ -44652,6 +44714,7 @@ function useChatController(_ref5) {
       restoreRef.current = null;
       pendingNewestCountRef.current = 0;
       setPendingNewestCount(0);
+      unreadRestoreCompletedRef.current = true;
       var container = scrollRef.current;
       var currentChannelId = (_channelRef$current = channelRef.current) === null || _channelRef$current === void 0 ? void 0 : _channelRef$current.id;
       var pendingLatestServerSync = ((_pendingLatestJumpRef = pendingLatestJumpRef.current) === null || _pendingLatestJumpRef === void 0 ? void 0 : _pendingLatestJumpRef.channelId) === currentChannelId && ((_pendingLatestJumpRef2 = pendingLatestJumpRef.current) === null || _pendingLatestJumpRef2 === void 0 ? void 0 : _pendingLatestJumpRef2.needsServerSync);
@@ -45126,7 +45189,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 +45198,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 +45454,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;
@@ -45512,6 +45581,7 @@ function useChatController(_ref5) {
       restoreRef.current = null;
       viewIsAtLatestRef.current = true;
       setIsViewingLatest(true);
+      lockJumpScrolling(true, 'latest');
       scrollToLatestEdge(container, 'smooth');
       rememberLatestEdge();
       return;
@@ -45572,7 +45642,7 @@ function useChatController(_ref5) {
       }
       rememberLatestEdge();
     }
-  }, [channel.id, unreadMessageId, isActiveEdgeRequestCurrent, dispatch, messages, unreadScrollTo, clearJumpBlur, hasNext, isScrollInteractionActive]);
+  }, [channel.id, unreadMessageId, isActiveEdgeRequestCurrent, dispatch, messages, unreadScrollTo, clearJumpBlur, hasNext, isScrollInteractionActive, lockJumpScrolling]);
   useEffect(function () {
     if (!unreadScrollTo || !unreadMessageId || !messages.length || unreadRestoreCompletedRef.current) {
       return;
@@ -45821,16 +45891,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));
     }
@@ -50737,10 +50797,10 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     editorState.read(function () {
       var root = $getRoot();
       var textContent = root.getTextContent();
-      var matches = linkify.match(textContent);
-      if (matches && matches.length > 0) {
-        var rawUrl = matches[0].url;
-        var firstUrl = matches[0].schema === '' ? rawUrl.replace(/^http:\/\//, 'https://') : rawUrl;
+      var protocolMatch = /https?:\/\/\S+/.exec(textContent);
+      var linkifyMatchResult = !protocolMatch ? linkify.match(textContent) : null;
+      var firstUrl = protocolMatch ? protocolMatch[0] : linkifyMatchResult !== null && linkifyMatchResult !== void 0 && linkifyMatchResult[0] ? linkifyMatchResult[0].schema === '' ? linkifyMatchResult[0].url.replace(/^http:\/\//, 'https://') : linkifyMatchResult[0].url : null;
+      if (firstUrl) {
         if (firstUrl !== detectedUrl) {
           closePreviewWithAnimation(function () {
             if (!dismissedUrls.has(firstUrl)) {
@@ -50900,11 +50960,11 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         }
         var linkAttachment;
         if (messageTexToSend) {
-          var _linkify = new LinkifyIt();
-          var match = _linkify.match(messageTexToSend);
-          if (match) {
-            var rawUrl = match[0].url;
-            var url = match[0].schema === '' ? rawUrl.replace(/^http:\/\//, 'https://') : rawUrl;
+          var _LinkifyIt$match;
+          var protocolMatch = /https?:\/\/\S+/.exec(messageTexToSend);
+          var linkifyMatchResult = !protocolMatch ? (_LinkifyIt$match = new LinkifyIt().match(messageTexToSend)) === null || _LinkifyIt$match === void 0 ? void 0 : _LinkifyIt$match[0] : null;
+          var url = protocolMatch ? protocolMatch[0] : linkifyMatchResult ? linkifyMatchResult.schema === '' ? linkifyMatchResult.url.replace(/^http:\/\//, 'https://') : linkifyMatchResult.url : null;
+          if (url) {
             var urlMetadata = oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[url];
             var metadata = {};
             if (urlMetadata) {
@@ -51019,11 +51079,11 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (messageTexToSend) {
       var linkAttachment;
       if (messageTexToSend) {
-        var _linkify2 = new LinkifyIt();
-        var match = _linkify2.match(messageTexToSend);
-        if (match) {
-          var rawUrl = match[0].url;
-          var url = match[0].schema === '' ? rawUrl.replace(/^http:\/\//, 'https://') : rawUrl;
+        var _LinkifyIt$match2;
+        var protocolMatch = /https?:\/\/\S+/.exec(messageTexToSend);
+        var linkifyMatchResult = !protocolMatch ? (_LinkifyIt$match2 = new LinkifyIt().match(messageTexToSend)) === null || _LinkifyIt$match2 === void 0 ? void 0 : _LinkifyIt$match2[0] : null;
+        var url = protocolMatch ? protocolMatch[0] : linkifyMatchResult ? linkifyMatchResult.schema === '' ? linkifyMatchResult.url.replace(/^http:\/\//, 'https://') : linkifyMatchResult.url : null;
+        if (url) {
           var urlMetadata = oGMetadata === null || oGMetadata === void 0 ? void 0 : oGMetadata[url];
           var metadata = {};
           if (urlMetadata) {
@@ -57978,5 +58038,5 @@ var unBlockUsers = function unBlockUsers(userIds, callback) {
   });
 };
 
-export { Attachment$1 as Attachment, Avatar, Channel, ChannelDetailsContainer as ChannelDetails, ChannelList, ChannelSearch, Chat, ChatHeader, CreateChannel, DropDown, EmojisPopup, ForwardMessagePopup, FrequentlyEmojis, MESSAGE_TYPE, MessagesContainer as MessageList, MessageStatusIcon, MessageTextFormat, MessagesScrollToBottomButton, MessagesScrollToUnreadMentionsButton, MessagesSearch, OGMetadata, PollMessage, SceytChatContainer as SceytChat, SendMessageInput as SendMessage, THEME_COLORS, blockUsers, createOrGetDirectChannel, handleGetMessage, handleSendMessage, switchChannelActiveChannel, unBlockUsers };
+export { Attachment$1 as Attachment, Avatar, Channel, ChannelDetailsContainer as ChannelDetails, ChannelList, ChannelSearch, Chat, ChatHeader, CreateChannel, DropDown, EmojisPopup, ForwardMessagePopup, FrequentlyEmojis, MESSAGE_TYPE, MessagesContainer as MessageList, MessageStatusIcon, MessageTextFormat, MessagesScrollToBottomButton, MessagesScrollToUnreadMentionsButton, MessagesSearch, OGMetadata, PollMessage, SceytChatContainer as SceytChat, SendMessageInput as SendMessage, THEME_COLORS, blockUsers, createOrGetDirectChannel, extractUrlMatches, handleGetMessage, handleSendMessage, switchChannelActiveChannel, unBlockUsers };
 //# sourceMappingURL=index.modern.js.map

package/messageUtils/index.d.ts

@@ -8,6 +8,10 @@ declare const MessageStatusIcon: ({ messageStatus, messageStatusDisplayingType,
     readIconColor?: string | undefined;
     accentColor?: string | undefined;
 }) => React.JSX.Element;
+declare function extractUrlMatches(text: string): Array<{
+    text: string;
+    url: string;
+}> | null;
 declare const MessageTextFormat: ({ text, message, contactsMap, getFromContacts, isLastMessage, asSampleText, accentColor, textSecondary, onMentionNameClick, shouldOpenUserProfileForMention, unsupportedMessage, target, isInviteLink, onInviteLinkClick }: {
     text: string;
     message: any;
@@ -24,4 +28,4 @@ declare const MessageTextFormat: ({ text, message, contactsMap, getFromContacts,
     isInviteLink?: boolean | undefined;
     onInviteLinkClick?: ((key: string) => void) | undefined;
 }) => any;
-export { MessageStatusIcon, MessageTextFormat };
+export { MessageStatusIcon, MessageTextFormat, extractUrlMatches };

package/messageUtils/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

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