sceyt-chat-react-uikit 1.8.7-beta.12 → 1.8.7-beta.14

package/index.js

@@ -15331,7 +15331,7 @@ var isChannelStillActive = function isChannelStillActive(channelId) {
 var getReconnectReloadAction = function getReconnectReloadAction(channel, visibleAnchorId, wasViewingLatest, applyVisibleWindow, isAtHistoryTop) {
   if (visibleAnchorId) {
     if (wasViewingLatest) {
-      return loadLatestMessagesAC(channel, undefined, false, applyVisibleWindow);
+      return loadLatestMessagesAC(channel, undefined, true, applyVisibleWindow);
     }
     if (isAtHistoryTop) {
       return loadAroundMessageAC(channel, visibleAnchorId);
@@ -15346,12 +15346,12 @@ var getReconnectReloadAction = function getReconnectReloadAction(channel, visibl
     };
   }
   if (wasViewingLatest) {
-    return loadLatestMessagesAC(channel, undefined, false, applyVisibleWindow);
+    return loadLatestMessagesAC(channel, undefined, true, applyVisibleWindow);
   }
   if (channel.newMessageCount && channel.lastDisplayedMessageId) {
     return loadNearUnreadAC(channel);
   }
-  return loadLatestMessagesAC(channel);
+  return loadLatestMessagesAC(channel, undefined, true);
 };
 var getReconnectChannelSnapshot = function getReconnectChannelSnapshot(channelId) {
   var _store$getState$Chann;
@@ -18595,7 +18595,7 @@ function loadDefaultMessages(action) {
         _context32.n = 30;
         return effects.call(loadOGMetadataForLinkMessages, filteredPendingMessages, true);
       case 30:
-        if (!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length && connectionState === CONNECTION_STATUS.CONNECTED)) {
+        if (!(!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length) && connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context32.n = 31;
           break;
         }
@@ -18748,7 +18748,7 @@ function getMessagesQuery(action) {
         break;
       case 17:
         cachedMessages = getLatestMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
-        cacheIsCurrent = cachedMessages.length > 0 && getLastConfirmedMessageId(cachedMessages) === ((_channel$lastMessage1 = channel.lastMessage) === null || _channel$lastMessage1 === void 0 ? void 0 : _channel$lastMessage1.id);
+        cacheIsCurrent = !networkChanged && cachedMessages.length > 0 && getLastConfirmedMessageId(cachedMessages) === ((_channel$lastMessage1 = channel.lastMessage) === null || _channel$lastMessage1 === void 0 ? void 0 : _channel$lastMessage1.id);
         if (!cacheIsCurrent) {
           _context33.n = 18;
           break;
@@ -44017,7 +44017,6 @@ function useChatController(_ref5) {
   var visibleUnreadReportedRef = React.useRef(new Set());
   var restoreRef = React.useRef(null);
   var lastBootKeyRef = React.useRef(null);
-  var pendingBootScrolledRef = React.useRef(false);
   var highlightedItemIdRef = React.useRef(null);
   var highlightTimeoutRef = React.useRef(null);
   var unreadRestoreCompletedRef = React.useRef(false);
@@ -45216,7 +45215,6 @@ function useChatController(_ref5) {
     currentJumpIdRef.current += 1;
     activeChannelIdRef.current = channel.id;
     lastBootKeyRef.current = null;
-    pendingBootScrolledRef.current = false;
     restoreRef.current = null;
     windowLoadScopeRef.current = null;
     activeEdgeIntentRef.current = null;
@@ -45313,26 +45311,13 @@ function useChatController(_ref5) {
       return;
     }
     if (!lastBootKeyRef.current) {
-      var hasConfirmedMessages = messages.some(function (m) {
-        return !!m.id;
-      });
-      if (hasConfirmedMessages) {
-        lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
-        pendingBootScrolledRef.current = false;
-        var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
-        restoreRef.current = unreadScrollTo && unreadMessageId ? {
-          mode: 'reveal-unread-separator'
-        } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
-          mode: 'to-bottom'
-        };
-      } else if (!pendingBootScrolledRef.current) {
-        pendingBootScrolledRef.current = true;
-        if (!restoreRef.current) {
-          restoreRef.current = {
-            mode: 'to-bottom'
-          };
-        }
-      }
+      lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
+      var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
+      restoreRef.current = unreadScrollTo && unreadMessageId ? {
+        mode: 'reveal-unread-separator'
+      } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
+        mode: 'to-bottom'
+      };
     }
     var restoreState = restoreRef.current;
     if (!restoreState) {
@@ -45686,7 +45671,7 @@ function useChatController(_ref5) {
       return;
     }
     var forceLatest = scrollToNewMessage.updateMessageList;
-    if (!isViewingLatest && (forceLatest || scrollToNewMessage.isIncomingMessage)) {
+    if (!forceLatest && scrollToNewMessage.isIncomingMessage && !isViewingLatest) {
       dispatch(scrollToNewMessageAC(false, false, false));
       return;
     }
@@ -50930,9 +50915,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           });
         }
       }
-      var messageToSend = _extends({}, messageToEdit, linkAttachment ? {
-        attachments: [linkAttachment]
-      } : {}, {
+      var existingMediaAttachments = (messageToEdit.attachments || []).filter(function (att) {
+        return att.type !== attachmentTypes.link;
+      });
+      var updatedAttachments = linkAttachment ? [].concat(existingMediaAttachments, [linkAttachment]) : existingMediaAttachments;
+      var messageToSend = _extends({}, messageToEdit, {
+        attachments: updatedAttachments,
         metadata: mentionedUsersPositions,
         bodyAttributes: messageBodyAttributes,
         mentionedUsers: mentionUsersToSend,

package/index.modern.js

@@ -15330,7 +15330,7 @@ var isChannelStillActive = function isChannelStillActive(channelId) {
 var getReconnectReloadAction = function getReconnectReloadAction(channel, visibleAnchorId, wasViewingLatest, applyVisibleWindow, isAtHistoryTop) {
   if (visibleAnchorId) {
     if (wasViewingLatest) {
-      return loadLatestMessagesAC(channel, undefined, false, applyVisibleWindow);
+      return loadLatestMessagesAC(channel, undefined, true, applyVisibleWindow);
     }
     if (isAtHistoryTop) {
       return loadAroundMessageAC(channel, visibleAnchorId);
@@ -15345,12 +15345,12 @@ var getReconnectReloadAction = function getReconnectReloadAction(channel, visibl
     };
   }
   if (wasViewingLatest) {
-    return loadLatestMessagesAC(channel, undefined, false, applyVisibleWindow);
+    return loadLatestMessagesAC(channel, undefined, true, applyVisibleWindow);
   }
   if (channel.newMessageCount && channel.lastDisplayedMessageId) {
     return loadNearUnreadAC(channel);
   }
-  return loadLatestMessagesAC(channel);
+  return loadLatestMessagesAC(channel, undefined, true);
 };
 var getReconnectChannelSnapshot = function getReconnectChannelSnapshot(channelId) {
   var _store$getState$Chann;
@@ -18594,7 +18594,7 @@ function loadDefaultMessages(action) {
         _context32.n = 30;
         return call(loadOGMetadataForLinkMessages, filteredPendingMessages, true);
       case 30:
-        if (!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length && connectionState === CONNECTION_STATUS.CONNECTED)) {
+        if (!(!(cachedMessages !== null && cachedMessages !== void 0 && cachedMessages.length) && connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context32.n = 31;
           break;
         }
@@ -18747,7 +18747,7 @@ function getMessagesQuery(action) {
         break;
       case 17:
         cachedMessages = getLatestMessagesFromMap(channel.id, MESSAGES_MAX_PAGE_COUNT);
-        cacheIsCurrent = cachedMessages.length > 0 && getLastConfirmedMessageId(cachedMessages) === ((_channel$lastMessage1 = channel.lastMessage) === null || _channel$lastMessage1 === void 0 ? void 0 : _channel$lastMessage1.id);
+        cacheIsCurrent = !networkChanged && cachedMessages.length > 0 && getLastConfirmedMessageId(cachedMessages) === ((_channel$lastMessage1 = channel.lastMessage) === null || _channel$lastMessage1 === void 0 ? void 0 : _channel$lastMessage1.id);
         if (!cacheIsCurrent) {
           _context33.n = 18;
           break;
@@ -44016,7 +44016,6 @@ function useChatController(_ref5) {
   var visibleUnreadReportedRef = useRef(new Set());
   var restoreRef = useRef(null);
   var lastBootKeyRef = useRef(null);
-  var pendingBootScrolledRef = useRef(false);
   var highlightedItemIdRef = useRef(null);
   var highlightTimeoutRef = useRef(null);
   var unreadRestoreCompletedRef = useRef(false);
@@ -45215,7 +45214,6 @@ function useChatController(_ref5) {
     currentJumpIdRef.current += 1;
     activeChannelIdRef.current = channel.id;
     lastBootKeyRef.current = null;
-    pendingBootScrolledRef.current = false;
     restoreRef.current = null;
     windowLoadScopeRef.current = null;
     activeEdgeIntentRef.current = null;
@@ -45312,26 +45310,13 @@ function useChatController(_ref5) {
       return;
     }
     if (!lastBootKeyRef.current) {
-      var hasConfirmedMessages = messages.some(function (m) {
-        return !!m.id;
-      });
-      if (hasConfirmedMessages) {
-        lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
-        pendingBootScrolledRef.current = false;
-        var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
-        restoreRef.current = unreadScrollTo && unreadMessageId ? {
-          mode: 'reveal-unread-separator'
-        } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
-          mode: 'to-bottom'
-        };
-      } else if (!pendingBootScrolledRef.current) {
-        pendingBootScrolledRef.current = true;
-        if (!restoreRef.current) {
-          restoreRef.current = {
-            mode: 'to-bottom'
-          };
-        }
-      }
+      lastBootKeyRef.current = channel.id + ":" + getMessageLocalRef(messages[0]);
+      var preservePendingHistoryEdge = pendingEdgeCheckAfterLoadRef.current && activeEdgeIntentRef.current === 'previous';
+      restoreRef.current = unreadScrollTo && unreadMessageId ? {
+        mode: 'reveal-unread-separator'
+      } : preservePendingHistoryEdge ? null : isScrollInteractionActive() ? null : {
+        mode: 'to-bottom'
+      };
     }
     var restoreState = restoreRef.current;
     if (!restoreState) {
@@ -45685,7 +45670,7 @@ function useChatController(_ref5) {
       return;
     }
     var forceLatest = scrollToNewMessage.updateMessageList;
-    if (!isViewingLatest && (forceLatest || scrollToNewMessage.isIncomingMessage)) {
+    if (!forceLatest && scrollToNewMessage.isIncomingMessage && !isViewingLatest) {
       dispatch(scrollToNewMessageAC(false, false, false));
       return;
     }
@@ -50929,9 +50914,12 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           });
         }
       }
-      var messageToSend = _extends({}, messageToEdit, linkAttachment ? {
-        attachments: [linkAttachment]
-      } : {}, {
+      var existingMediaAttachments = (messageToEdit.attachments || []).filter(function (att) {
+        return att.type !== attachmentTypes.link;
+      });
+      var updatedAttachments = linkAttachment ? [].concat(existingMediaAttachments, [linkAttachment]) : existingMediaAttachments;
+      var messageToSend = _extends({}, messageToEdit, {
+        attachments: updatedAttachments,
         metadata: mentionedUsersPositions,
         bodyAttributes: messageBodyAttributes,
         mentionedUsers: mentionUsersToSend,

package/package.json

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