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

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

@@ -18850,8 +18850,31 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     return Promise.reject(e);
   }
 };
+var updateMessage$1 = function updateMessage(actionType, pending, channel, scrollToNewMessage) {
+  if (scrollToNewMessage === void 0) {
+    scrollToNewMessage = true;
+  }
+  try {
+    var activeChannelId = getActiveChannelId();
+    if (actionType !== RESEND_MESSAGE) {
+      addMessageToMap(channel.id, pending);
+      if (activeChannelId === channel.id) {
+        addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
+      }
+      if (activeChannelId === channel.id) {
+        store.dispatch(addMessageAC(pending));
+      }
+      if (scrollToNewMessage) {
+        store.dispatch(scrollToNewMessageAC(true));
+      }
+    }
+    return Promise.resolve();
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, pending, _loop2, _i, _t2;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -18918,7 +18941,7 @@ function sendMessage(action) {
           break;
         }
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend;
+          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.n) {
               case 0:
@@ -18983,9 +19006,12 @@ function sendMessage(action) {
                     createdAt: new Date(Date.now())
                   });
                   messagesToSend.push(messageForSend);
-                  pendingMessages.push(_extends({}, messageForSend, {
-                    attachments: [attachment]
-                  }));
+                  _pending = _extends({}, messageForSend, {
+                    attachments: [attachment],
+                    createdAt: new Date(Date.now())
+                  });
+                  pendingMessages.push(_pending);
+                  updateMessage$1(action.type, _pending, channel);
                 } else {
                   attachmentsToSend.push(messageAttachment);
                 }
@@ -19022,9 +19048,12 @@ function sendMessage(action) {
             messageBuilder.setReplyInThread();
           }
           messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
-          pendingMessages.push(_extends({}, messageToSend, {
-            attachments: message.attachments
-          }));
+          pending = _extends({}, messageToSend, {
+            attachments: message.attachments,
+            createdAt: new Date(Date.now())
+          });
+          pendingMessages.push(pending);
+          updateMessage$1(action.type, pending, channel);
           messageToSend = _extends({}, messageToSend, {
             attachments: attachmentsToSend
           });
@@ -19032,7 +19061,7 @@ 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, _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:
@@ -19040,23 +19069,6 @@ function sendMessage(action) {
                 messageToSend = messagesToSend[_i];
                 _context2.p = 1;
                 messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
-                activeChannelId = getActiveChannelId();
-                if (action.type !== RESEND_MESSAGE) {
-                  addMessageToMap(channel.id, _extends({}, messageToSend, {
-                    createdAt: new Date(Date.now())
-                  }));
-                  if (activeChannelId === channel.id) {
-                    addAllMessages([_extends({}, messageToSend, {
-                      createdAt: new Date(Date.now())
-                    })], MESSAGE_LOAD_DIRECTION.NEXT);
-                  }
-                  if (activeChannelId === channel.id) {
-                    store.dispatch(addMessageAC(_extends({}, messageToSend, {
-                      createdAt: new Date(Date.now())
-                    })));
-                  }
-                  store.dispatch(scrollToNewMessageAC(true));
-                }
                 if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
                   _context2.n = 12;
                   break;
@@ -19253,7 +19265,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, createdMessage, 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, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19329,16 +19341,8 @@ function sendTextMessage(action) {
         if (pendingMessage && pendingMessage.metadata) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
         }
-        if (action.type !== RESEND_MESSAGE && pendingMessage) {
-          _activeChannelId = getActiveChannelId();
-          addMessageToMap(channel.id, pendingMessage);
-          if (_activeChannelId === channel.id) {
-            addAllMessages([pendingMessage], MESSAGE_LOAD_DIRECTION.NEXT);
-          }
-          if (_activeChannelId === channel.id) {
-            store.dispatch(addMessageAC(pendingMessage));
-          }
-          store.dispatch(scrollToNewMessageAC(true));
+        if (pendingMessage) {
+          updateMessage$1(action.type, pendingMessage, channel);
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context4.n = 15;
@@ -19570,14 +19574,8 @@ function forwardMessage(action) {
         _context5.n = 8;
         return effects.put(getMessagesAC(channel));
       case 8:
-        if (action.type !== RESEND_MESSAGE) {
-          addMessageToMap(channel.id, pendingMessage);
-          if (activeChannelId === channel.id) {
-            addAllMessages([pendingMessage], MESSAGE_LOAD_DIRECTION.NEXT);
-          }
-          if (activeChannelId === channel.id) {
-            store.dispatch(addMessageAC(pendingMessage));
-          }
+        if (pendingMessage) {
+          updateMessage$1(action.type, pendingMessage, channel, false);
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context5.n = 14;
@@ -29274,7 +29272,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];
@@ -29285,19 +29284,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);
@@ -29311,7 +29314,7 @@ var Message = function Message(_ref) {
         removeMessageFromVisibleMessagesMap(message);
       }
     }
-  }, [isVisible]);
+  }, [isVisible, unreadScrollTo]);
   useDidUpdate(function () {
     if (tabIsActive) {
       handleSendReadMarker();
@@ -38627,7 +38630,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

@@ -18849,8 +18849,31 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
     return Promise.reject(e);
   }
 };
+var updateMessage$1 = function updateMessage(actionType, pending, channel, scrollToNewMessage) {
+  if (scrollToNewMessage === void 0) {
+    scrollToNewMessage = true;
+  }
+  try {
+    var activeChannelId = getActiveChannelId();
+    if (actionType !== RESEND_MESSAGE) {
+      addMessageToMap(channel.id, pending);
+      if (activeChannelId === channel.id) {
+        addAllMessages([pending], MESSAGE_LOAD_DIRECTION.NEXT);
+      }
+      if (activeChannelId === channel.id) {
+        store.dispatch(addMessageAC(pending));
+      }
+      if (scrollToNewMessage) {
+        store.dispatch(scrollToNewMessageAC(true));
+      }
+    }
+    return Promise.resolve();
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
 function sendMessage(action) {
-  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, _loop2, _i, _t2;
+  var payload, message, connectionState, channelId, sendAttachmentsAsSeparateMessage, isAddToPendingMessagesMap, pendingMessages, channel, SceytChatClient, createChannelData, mentionedUserIds, customUploader, linkAttachment, attachmentsToSend, messagesToSend, mediaAttachments, _loop, i, messageBuilder, messageToSend, pending, _loop2, _i, _t2;
   return _regenerator().w(function (_context3) {
     while (1) switch (_context3.p = _context3.n) {
       case 0:
@@ -18917,7 +18940,7 @@ function sendMessage(action) {
           break;
         }
         _loop = /*#__PURE__*/_regenerator().m(function _callee() {
-          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend;
+          var attachment, uri, attachmentBuilder, messageAttachment, handleUpdateUploadProgress, _messageBuilder, _messageToSend, messageForSend, _pending;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.n) {
               case 0:
@@ -18982,9 +19005,12 @@ function sendMessage(action) {
                     createdAt: new Date(Date.now())
                   });
                   messagesToSend.push(messageForSend);
-                  pendingMessages.push(_extends({}, messageForSend, {
-                    attachments: [attachment]
-                  }));
+                  _pending = _extends({}, messageForSend, {
+                    attachments: [attachment],
+                    createdAt: new Date(Date.now())
+                  });
+                  pendingMessages.push(_pending);
+                  updateMessage$1(action.type, _pending, channel);
                 } else {
                   attachmentsToSend.push(messageAttachment);
                 }
@@ -19021,9 +19047,12 @@ function sendMessage(action) {
             messageBuilder.setReplyInThread();
           }
           messageToSend = action.type === RESEND_MESSAGE ? action.payload.message : messageBuilder.create();
-          pendingMessages.push(_extends({}, messageToSend, {
-            attachments: message.attachments
-          }));
+          pending = _extends({}, messageToSend, {
+            attachments: message.attachments,
+            createdAt: new Date(Date.now())
+          });
+          pendingMessages.push(pending);
+          updateMessage$1(action.type, pending, channel);
           messageToSend = _extends({}, messageToSend, {
             attachments: attachmentsToSend
           });
@@ -19031,7 +19060,7 @@ 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, _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:
@@ -19039,23 +19068,6 @@ function sendMessage(action) {
                 messageToSend = messagesToSend[_i];
                 _context2.p = 1;
                 messageCopy = JSON.parse(JSON.stringify(messagesToSend[_i]));
-                activeChannelId = getActiveChannelId();
-                if (action.type !== RESEND_MESSAGE) {
-                  addMessageToMap(channel.id, _extends({}, messageToSend, {
-                    createdAt: new Date(Date.now())
-                  }));
-                  if (activeChannelId === channel.id) {
-                    addAllMessages([_extends({}, messageToSend, {
-                      createdAt: new Date(Date.now())
-                    })], MESSAGE_LOAD_DIRECTION.NEXT);
-                  }
-                  if (activeChannelId === channel.id) {
-                    store.dispatch(addMessageAC(_extends({}, messageToSend, {
-                      createdAt: new Date(Date.now())
-                    })));
-                  }
-                  store.dispatch(scrollToNewMessageAC(true));
-                }
                 if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
                   _context2.n = 12;
                   break;
@@ -19252,7 +19264,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, createdMessage, 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, _messageResponse, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t3;
   return _regenerator().w(function (_context4) {
     while (1) switch (_context4.p = _context4.n) {
       case 0:
@@ -19328,16 +19340,8 @@ function sendTextMessage(action) {
         if (pendingMessage && pendingMessage.metadata) {
           pendingMessage.metadata = JSON.parse(pendingMessage.metadata);
         }
-        if (action.type !== RESEND_MESSAGE && pendingMessage) {
-          _activeChannelId = getActiveChannelId();
-          addMessageToMap(channel.id, pendingMessage);
-          if (_activeChannelId === channel.id) {
-            addAllMessages([pendingMessage], MESSAGE_LOAD_DIRECTION.NEXT);
-          }
-          if (_activeChannelId === channel.id) {
-            store.dispatch(addMessageAC(pendingMessage));
-          }
-          store.dispatch(scrollToNewMessageAC(true));
+        if (pendingMessage) {
+          updateMessage$1(action.type, pendingMessage, channel);
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context4.n = 15;
@@ -19569,14 +19573,8 @@ function forwardMessage(action) {
         _context5.n = 8;
         return put(getMessagesAC(channel));
       case 8:
-        if (action.type !== RESEND_MESSAGE) {
-          addMessageToMap(channel.id, pendingMessage);
-          if (activeChannelId === channel.id) {
-            addAllMessages([pendingMessage], MESSAGE_LOAD_DIRECTION.NEXT);
-          }
-          if (activeChannelId === channel.id) {
-            store.dispatch(addMessageAC(pendingMessage));
-          }
+        if (pendingMessage) {
+          updateMessage$1(action.type, pendingMessage, channel, false);
         }
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
           _context5.n = 14;
@@ -29273,7 +29271,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];
@@ -29284,19 +29283,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);
@@ -29310,7 +29313,7 @@ var Message = function Message(_ref) {
         removeMessageFromVisibleMessagesMap(message);
       }
     }
-  }, [isVisible]);
+  }, [isVisible, unreadScrollTo]);
   useDidUpdate(function () {
     if (tabIsActive) {
       handleSendReadMarker();
@@ -38626,7 +38629,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.12",
+  "version": "1.7.7-beta.14",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",