sceyt-chat-react-uikit 1.7.7-beta.11 → 1.7.7-beta.13

package/components/Messages/SystemMessage/index.d.ts

@@ -15,8 +15,9 @@ interface ISystemMessageProps {
     backgroundColor?: string;
     borderRadius?: string;
     tabIsActive?: boolean;
+    setLastVisibleMessageId?: (messageId: string) => void;
 }
-declare const _default: React.MemoExoticComponent<({ message, nextMessage, connectionStatus, channel, tabIsActive, differentUserMessageSpacing, fontSize, textColor, border, backgroundColor, borderRadius, contactsMap }: ISystemMessageProps) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ message, nextMessage, connectionStatus, channel, tabIsActive, differentUserMessageSpacing, fontSize, textColor, border, backgroundColor, borderRadius, contactsMap, setLastVisibleMessageId }: ISystemMessageProps) => React.JSX.Element>;
 export default _default;
 export declare const Container: import("styled-components").StyledComponent<"div", any, {
     topOffset?: number | undefined;

package/index.js

@@ -18851,7 +18851,7 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
   }
 };
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, messageCopy, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, _loop2, _i, _t2;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -19022,10 +19022,7 @@ function sendMessage(action) {
             messageBuilder.setReplyInThread();
           }
           messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
-          messageCopy = _extends({}, messageToSend, {
-            createdAt: new Date(Date.now())
-          });
-          pendingMessages.push(_extends({}, messageCopy, {
+          pendingMessages.push(_extends({}, messageToSend, {
             attachments: message.attachments
           }));
           messageToSend = _extends({}, messageToSend, {
@@ -19035,22 +19032,28 @@ function sendMessage(action) {
         }
       case 11:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee2() {
-          var messageAttachment, messageToSend, _messageCopy, activeChannelId, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, _t;
+          var messageAttachment, messageToSend, messageCopy, activeChannelId, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, _t;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.p = _context2.n) {
               case 0:
                 messageAttachment = messagesToSend[_i].attachments;
                 messageToSend = messagesToSend[_i];
                 _context2.p = 1;
-                _messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
+                messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
                 activeChannelId = getActiveChannelId();
                 if (action.type !== RESEND_MESSAGE) {
-                  addMessageToMap(channel.id, messageToSend);
+                  addMessageToMap(channel.id, _extends({}, messageToSend, {
+                    createdAt: new Date(Date.now())
+                  }));
                   if (activeChannelId === channel.id) {
-                    addAllMessages([messageToSend], MESSAGE_LOAD_DIRECTION.NEXT);
+                    addAllMessages([_extends({}, messageToSend, {
+                      createdAt: new Date(Date.now())
+                    })], MESSAGE_LOAD_DIRECTION.NEXT);
                   }
                   if (activeChannelId === channel.id) {
-                    store.dispatch(addMessageAC(messageToSend));
+                    store.dispatch(addMessageAC(_extends({}, messageToSend, {
+                      createdAt: new Date(Date.now())
+                    })));
                   }
                   store.dispatch(scrollToNewMessageAC(true));
                 }
@@ -19064,7 +19067,7 @@ function sendMessage(action) {
                   break;
                 }
                 _context2.n = 2;
-                return effects.call(handleUploadAttachments, messageAttachment || [], _messageCopy, channel);
+                return effects.call(handleUploadAttachments, messageAttachment || [], messageCopy, channel);
               case 2:
                 _attachmentsToSend = _context2.v;
               case 3:
@@ -19250,7 +19253,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 15]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, _activeChannelId, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _activeChannelId, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19313,13 +19316,15 @@ function sendTextMessage(action) {
         if (message.repliedInThread) {
           messageBuilder.setReplyInThread();
         }
-        messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
-        pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
-          attachments: message === null || message === void 0 ? void 0 : message.attachments,
+        createdMessage = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
+        messageToSend = _extends({}, createdMessage, action.type === RESEND_MESSAGE ? {
+          attachments: message === null || message === void 0 ? void 0 : message.attachments
+        } : {});
+        pendingMessage = _extends({}, messageToSend, {
           createdAt: new Date(Date.now()),
           mentionedUsers: message.mentionedUsers,
           parentMessage: message.parentMessage
-        })));
+        });
         sendMessageTid = messageToSend.tid;
         if (pendingMessage && pendingMessage.metadata) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
@@ -29269,7 +29274,8 @@ var Message = function Message(_ref) {
     border = _ref.border,
     backgroundColor = _ref.backgroundColor,
     borderRadius = _ref.borderRadius,
-    contactsMap = _ref.contactsMap;
+    contactsMap = _ref.contactsMap,
+    setLastVisibleMessageId = _ref.setLastVisibleMessageId;
   var _useColor = useColors(),
     textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
     overlayBackground = _useColor[THEME_COLORS.OVERLAY_BACKGROUND];
@@ -29280,19 +29286,23 @@ var Message = function Message(_ref) {
   var getFromContacts = getShowOnlyContactUsers();
   var messageItemRef = React.useRef();
   var isVisible = useOnScreen(messageItemRef);
+  var unreadScrollTo = useSelector(unreadScrollToSelector);
   var messageMetas = React.useMemo(function () {
     return isJSON(message.metadata) ? JSON.parse(message.metadata) : message.metadata;
   }, [message.metadata]);
   var handleSendReadMarker = function handleSendReadMarker() {
     if (isVisible && message.incoming && !(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-    })) && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    })) && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED && !unreadScrollTo) {
       dispatch(markMessagesAsReadAC(channel.id, [message.id]));
     }
   };
   React.useEffect(function () {
-    if (isVisible) {
+    if (isVisible && !unreadScrollTo) {
       var _channel$lastMessage;
+      if (setLastVisibleMessageId) {
+        setLastVisibleMessageId(message.id);
+      }
       handleSendReadMarker();
       if (!channel.isLinkedChannel) {
         setMessageToVisibleMessagesMap(message);
@@ -29306,7 +29316,7 @@ var Message = function Message(_ref) {
         removeMessageFromVisibleMessagesMap(message);
       }
     }
-  }, [isVisible]);
+  }, [isVisible, unreadScrollTo]);
   useDidUpdate(function () {
     if (tabIsActive) {
       handleSendReadMarker();
@@ -38622,7 +38632,8 @@ var MessageList = function MessageList(_ref2) {
       textColor: dateDividerTextColor,
       border: dateDividerBorder,
       backgroundColor: dateDividerBackgroundColor,
-      borderRadius: dateDividerBorderRadius
+      borderRadius: dateDividerBorderRadius,
+      setLastVisibleMessageId: _setLastVisibleMessageId
     })) : (/*#__PURE__*/React__default.createElement(MessageWrapper, {
       key: message.id || message.tid,
       id: message.id,

package/index.modern.js

@@ -18850,7 +18850,7 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
   }
 };
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, messageCopy, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, _loop2, _i, _t2;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -19021,10 +19021,7 @@ function sendMessage(action) {
             messageBuilder.setReplyInThread();
           }
           messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
-          messageCopy = _extends({}, messageToSend, {
-            createdAt: new Date(Date.now())
-          });
-          pendingMessages.push(_extends({}, messageCopy, {
+          pendingMessages.push(_extends({}, messageToSend, {
             attachments: message.attachments
           }));
           messageToSend = _extends({}, messageToSend, {
@@ -19034,22 +19031,28 @@ function sendMessage(action) {
         }
       case 11:
         _loop2 = /*#__PURE__*/_regenerator().m(function _callee2() {
-          var messageAttachment, messageToSend, _messageCopy, activeChannelId, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, _t;
+          var messageAttachment, messageToSend, messageCopy, activeChannelId, _attachmentsToSend, linkAttachmentToSend, linkAttachmentBuilder, messageResponse, k, pendingAttachment, attachmentsToUpdate, currentAttachmentsMap, messageUpdateData, messageToUpdate, channelUpdateParam, pendingMessage, _t;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.p = _context2.n) {
               case 0:
                 messageAttachment = messagesToSend[_i].attachments;
                 messageToSend = messagesToSend[_i];
                 _context2.p = 1;
-                _messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
+                messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
                 activeChannelId = getActiveChannelId();
                 if (action.type !== RESEND_MESSAGE) {
-                  addMessageToMap(channel.id, messageToSend);
+                  addMessageToMap(channel.id, _extends({}, messageToSend, {
+                    createdAt: new Date(Date.now())
+                  }));
                   if (activeChannelId === channel.id) {
-                    addAllMessages([messageToSend], MESSAGE_LOAD_DIRECTION.NEXT);
+                    addAllMessages([_extends({}, messageToSend, {
+                      createdAt: new Date(Date.now())
+                    })], MESSAGE_LOAD_DIRECTION.NEXT);
                   }
                   if (activeChannelId === channel.id) {
-                    store.dispatch(addMessageAC(messageToSend));
+                    store.dispatch(addMessageAC(_extends({}, messageToSend, {
+                      createdAt: new Date(Date.now())
+                    })));
                   }
                   store.dispatch(scrollToNewMessageAC(true));
                 }
@@ -19063,7 +19066,7 @@ function sendMessage(action) {
                   break;
                 }
                 _context2.n = 2;
-                return call(handleUploadAttachments, messageAttachment || [], _messageCopy, channel);
+                return call(handleUploadAttachments, messageAttachment || [], messageCopy, channel);
               case 2:
                 _attachmentsToSend = _context2.v;
               case 3:
@@ -19249,7 +19252,7 @@ function sendMessage(action) {
   }, _marked$3, null, [[1, 15]]);
 }
 function sendTextMessage(action) {
-  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, _activeChannelId, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
+  var payload, message, connectionState, channelId, isAddToPendingMessagesMap, channel, sendMessageTid, pendingMessage, activeChannelId, SceytChatClient, createChannelData, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, createdMessage, messageToSend, _activeChannelId, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19312,13 +19315,15 @@ function sendTextMessage(action) {
         if (message.repliedInThread) {
           messageBuilder.setReplyInThread();
         }
-        messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
-        pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
-          attachments: message === null || message === void 0 ? void 0 : message.attachments,
+        createdMessage = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
+        messageToSend = _extends({}, createdMessage, action.type === RESEND_MESSAGE ? {
+          attachments: message === null || message === void 0 ? void 0 : message.attachments
+        } : {});
+        pendingMessage = _extends({}, messageToSend, {
           createdAt: new Date(Date.now()),
           mentionedUsers: message.mentionedUsers,
           parentMessage: message.parentMessage
-        })));
+        });
         sendMessageTid = messageToSend.tid;
         if (pendingMessage && pendingMessage.metadata) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
@@ -29268,7 +29273,8 @@ var Message = function Message(_ref) {
     border = _ref.border,
     backgroundColor = _ref.backgroundColor,
     borderRadius = _ref.borderRadius,
-    contactsMap = _ref.contactsMap;
+    contactsMap = _ref.contactsMap,
+    setLastVisibleMessageId = _ref.setLastVisibleMessageId;
   var _useColor = useColors(),
     textOnPrimary = _useColor[THEME_COLORS.TEXT_ON_PRIMARY],
     overlayBackground = _useColor[THEME_COLORS.OVERLAY_BACKGROUND];
@@ -29279,19 +29285,23 @@ var Message = function Message(_ref) {
   var getFromContacts = getShowOnlyContactUsers();
   var messageItemRef = useRef();
   var isVisible = useOnScreen(messageItemRef);
+  var unreadScrollTo = useSelector(unreadScrollToSelector);
   var messageMetas = useMemo(function () {
     return isJSON(message.metadata) ? JSON.parse(message.metadata) : message.metadata;
   }, [message.metadata]);
   var handleSendReadMarker = function handleSendReadMarker() {
     if (isVisible && message.incoming && !(message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
       return marker.name === MESSAGE_DELIVERY_STATUS.READ;
-    })) && connectionStatus === CONNECTION_STATUS.CONNECTED) {
+    })) && channel.newMessageCount && channel.newMessageCount > 0 && connectionStatus === CONNECTION_STATUS.CONNECTED && !unreadScrollTo) {
       dispatch(markMessagesAsReadAC(channel.id, [message.id]));
     }
   };
   useEffect(function () {
-    if (isVisible) {
+    if (isVisible && !unreadScrollTo) {
       var _channel$lastMessage;
+      if (setLastVisibleMessageId) {
+        setLastVisibleMessageId(message.id);
+      }
       handleSendReadMarker();
       if (!channel.isLinkedChannel) {
         setMessageToVisibleMessagesMap(message);
@@ -29305,7 +29315,7 @@ var Message = function Message(_ref) {
         removeMessageFromVisibleMessagesMap(message);
       }
     }
-  }, [isVisible]);
+  }, [isVisible, unreadScrollTo]);
   useDidUpdate(function () {
     if (tabIsActive) {
       handleSendReadMarker();
@@ -38621,7 +38631,8 @@ var MessageList = function MessageList(_ref2) {
       textColor: dateDividerTextColor,
       border: dateDividerBorder,
       backgroundColor: dateDividerBackgroundColor,
-      borderRadius: dateDividerBorderRadius
+      borderRadius: dateDividerBorderRadius,
+      setLastVisibleMessageId: _setLastVisibleMessageId
     })) : (/*#__PURE__*/React__default.createElement(MessageWrapper, {
       key: message.id || message.tid,
       id: message.id,

package/package.json

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