sceyt-chat-react-uikit 1.7.6-beta.7 → 1.7.6-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/index.js +23 -10
  2. package/index.modern.js +23 -10
  3. package/package.json +1 -1
package/index.js CHANGED
@@ -19989,7 +19989,7 @@ function editMessage(action) {
19989
19989
  }, _marked6$1, null, [[0, 5]]);
19990
19990
  }
19991
19991
  function getMessagesQuery(action) {
19992
- var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, lastMessageId, _allMessages2, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
19992
+ var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
19993
19993
  return _regenerator().w(function (_context9) {
19994
19994
  while (1) switch (_context9.p = _context9.n) {
19995
19995
  case 0:
@@ -20233,6 +20233,7 @@ function getMessagesQuery(action) {
20233
20233
  _context9.n = 46;
20234
20234
  break;
20235
20235
  case 39:
20236
+ previousAllMessages = getAllMessages();
20236
20237
  setMessagesToMap(channel.id, []);
20237
20238
  setAllMessages([]);
20238
20239
  if (!(cachedMessages && cachedMessages.length)) {
@@ -20272,10 +20273,21 @@ function getMessagesQuery(action) {
20272
20273
  });
20273
20274
  lastMessageId = updatedMessages[updatedMessages.length - 1].id;
20274
20275
  _allMessages2 = getAllMessages();
20275
- allMessagesAfterLastMessage = _allMessages2.filter(function (msg) {
20276
+ setMappedAllMessages = {};
20277
+ previousAllMessages.forEach(function (msg) {
20278
+ if (msg.channelId === channel.id) {
20279
+ setMappedAllMessages[msg.id] = msg;
20280
+ }
20281
+ });
20282
+ _allMessages2.forEach(function (msg) {
20283
+ if (msg.channelId === channel.id) {
20284
+ setMappedAllMessages[msg.id] = msg;
20285
+ }
20286
+ });
20287
+ allMessagesAfterLastMessage = (_Object$values = Object.values(setMappedAllMessages)) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
20276
20288
  return msg.id > lastMessageId;
20277
20289
  });
20278
- updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage);
20290
+ updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage || []);
20279
20291
  setMessagesToMap(channel.id, updatedMessages);
20280
20292
  setAllMessages(updatedMessages);
20281
20293
  _context9.n = 44;
@@ -23965,7 +23977,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
23965
23977
  return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
23966
23978
  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'RM' ? " removed " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.slice(0, 5).map(function (mem) {
23967
23979
  return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
23968
- })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'Joined via invite link' : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
23980
+ })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
23969
23981
  poll: (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.pollDetails) && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.type) === exports.MESSAGE_TYPE.POLL
23970
23982
  }, channel.lastReactedMessage && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, "Reacted", /*#__PURE__*/React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].key), "to", ' "')), LastMessageAttachments({
23971
23983
  lastMessage: lastMessage
@@ -30235,7 +30247,7 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
30235
30247
  preload: 'auto',
30236
30248
  id: 'video',
30237
30249
  src: file.attachmentUrl || videoUrl
30238
- }), videoCurrentTime && !isRepliedMessage && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30250
+ }), videoCurrentTime && !isRepliedMessage && (!isDetailsView || !loading) && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30239
30251
  /*#__PURE__*/
30240
30252
  React__default.createElement(VideoPlayButton, null, /*#__PURE__*/React__default.createElement(SvgPlayVideo, null))), /*#__PURE__*/React__default.createElement(VideoTime, {
30241
30253
  isDetailsView: isDetailsView,
@@ -36680,7 +36692,7 @@ var Message$1 = function Message(_ref) {
36680
36692
  })) {
36681
36693
  if (message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
36682
36694
  return marker.name === MESSAGE_DELIVERY_STATUS.READ;
36683
- }) && message.incoming) {
36695
+ }) && message.incoming && !unreadScrollTo) {
36684
36696
  dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
36685
36697
  }
36686
36698
  }
@@ -36744,7 +36756,7 @@ var Message$1 = function Message(_ref) {
36744
36756
  removeMessageFromVisibleMessagesMap(message);
36745
36757
  }
36746
36758
  }
36747
- }, [isVisible]);
36759
+ }, [isVisible, unreadScrollTo]);
36748
36760
  useDidUpdate(function () {
36749
36761
  if (tabIsActive) {
36750
36762
  handleSendReadMarker();
@@ -38011,13 +38023,14 @@ var MessageList = function MessageList(_ref2) {
38011
38023
  if (scrollElement) {
38012
38024
  scrollElement.style.scrollBehavior = 'inherit';
38013
38025
  }
38026
+ setScrollIntoView(true);
38014
38027
  var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId);
38015
38028
  if (lastReadMessageNode && scrollElement) {
38029
+ dispatch(scrollToNewMessageAC(false));
38016
38030
  scrollElement.scrollTo({
38017
38031
  top: lastReadMessageNode.offsetTop - 200,
38018
- behavior: 'smooth'
38032
+ behavior: 'auto'
38019
38033
  });
38020
- setScrollIntoView(true);
38021
38034
  setTimeout(function () {
38022
38035
  dispatch(setUnreadScrollToAC(false));
38023
38036
  setScrollIntoView(false);
@@ -45067,7 +45080,7 @@ var Media = function Media(_ref) {
45067
45080
  })));
45068
45081
  };
45069
45082
  var Container$o = styled__default.div(_templateObject$V || (_templateObject$V = _taggedTemplateLiteralLoose(["\n padding: 6px 4px;\n overflow-x: hidden;\n overflow-y: auto;\n list-style: none;\n transition: all 0.2s;\n align-items: flex-start;\n display: flex;\n flex-wrap: wrap;\n"])));
45070
- var MediaItem = styled__default.div(_templateObject2$Q || (_templateObject2$Q = _taggedTemplateLiteralLoose(["\n width: calc(33.3333% - 4px);\n height: 110px;\n box-sizing: border-box;\n //border: 1px solid #ccc;\n border: 0.5px solid rgba(0, 0, 0, 0.1);\n border-radius: 8px;\n overflow: hidden;\n margin: 2px;\n"])));
45083
+ var MediaItem = styled__default.div(_templateObject2$Q || (_templateObject2$Q = _taggedTemplateLiteralLoose(["\n width: calc(33.3333% - 4px);\n aspect-ratio: 1/1;\n box-sizing: border-box;\n //border: 1px solid #ccc;\n border: 0.5px solid rgba(0, 0, 0, 0.1);\n border-radius: 8px;\n overflow: hidden;\n margin: 2px;\n"])));
45071
45084
 
45072
45085
  var _rect$3, _path$1u;
45073
45086
  function _extends$1y() {
package/index.modern.js CHANGED
@@ -19988,7 +19988,7 @@ function editMessage(action) {
19988
19988
  }, _marked6$1, null, [[0, 5]]);
19989
19989
  }
19990
19990
  function getMessagesQuery(action) {
19991
- var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _secondResult4, updatedMessages, lastMessageId, _allMessages2, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
19991
+ var _action$payload, channel, loadWithLastMessage, messageId, limit, withDeliveredMessages, highlight, behavior, SceytChatClient, messageQueryBuilder, messageQuery, cachedMessages, result, allMessages, havLastMessage, secondResult, sentMessages, messagesMap, filteredSentMessages, _allMessages, messageIndex, maxLengthPart, _secondResult, thirdResult, _secondResult2, _thirdResult, _secondResult3, _Object$values, previousAllMessages, _secondResult4, updatedMessages, lastMessageId, _allMessages2, setMappedAllMessages, allMessagesAfterLastMessage, pendingMessages, _messagesMap, filteredPendingMessages, _t9;
19992
19992
  return _regenerator().w(function (_context9) {
19993
19993
  while (1) switch (_context9.p = _context9.n) {
19994
19994
  case 0:
@@ -20232,6 +20232,7 @@ function getMessagesQuery(action) {
20232
20232
  _context9.n = 46;
20233
20233
  break;
20234
20234
  case 39:
20235
+ previousAllMessages = getAllMessages();
20235
20236
  setMessagesToMap(channel.id, []);
20236
20237
  setAllMessages([]);
20237
20238
  if (!(cachedMessages && cachedMessages.length)) {
@@ -20271,10 +20272,21 @@ function getMessagesQuery(action) {
20271
20272
  });
20272
20273
  lastMessageId = updatedMessages[updatedMessages.length - 1].id;
20273
20274
  _allMessages2 = getAllMessages();
20274
- allMessagesAfterLastMessage = _allMessages2.filter(function (msg) {
20275
+ setMappedAllMessages = {};
20276
+ previousAllMessages.forEach(function (msg) {
20277
+ if (msg.channelId === channel.id) {
20278
+ setMappedAllMessages[msg.id] = msg;
20279
+ }
20280
+ });
20281
+ _allMessages2.forEach(function (msg) {
20282
+ if (msg.channelId === channel.id) {
20283
+ setMappedAllMessages[msg.id] = msg;
20284
+ }
20285
+ });
20286
+ allMessagesAfterLastMessage = (_Object$values = Object.values(setMappedAllMessages)) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
20275
20287
  return msg.id > lastMessageId;
20276
20288
  });
20277
- updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage);
20289
+ updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage || []);
20278
20290
  setMessagesToMap(channel.id, updatedMessages);
20279
20291
  setAllMessages(updatedMessages);
20280
20292
  _context9.n = 44;
@@ -23964,7 +23976,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
23964
23976
  return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
23965
23977
  })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'RM' ? " removed " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.slice(0, 5).map(function (mem) {
23966
23978
  return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
23967
- })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'Joined via invite link' : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
23979
+ })) + " " + (lastMessageMetas && lastMessageMetas.m && lastMessageMetas.m.length > 5 ? "and " + (lastMessageMetas.m.length - 5) + " more" : '') : lastMessage.body === 'LG' ? 'Left this group' : lastMessage.body === 'JL' ? 'joined via invite link' : '') : (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(LastMessageDescription, {
23968
23980
  poll: (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.pollDetails) && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.type) === MESSAGE_TYPE.POLL
23969
23981
  }, channel.lastReactedMessage && (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, "Reacted", /*#__PURE__*/React__default.createElement(ReactionItem, null, channel.newReactions && channel.newReactions[0] && channel.newReactions[0].key), "to", ' "')), LastMessageAttachments({
23970
23982
  lastMessage: lastMessage
@@ -30234,7 +30246,7 @@ var VideoPreview = /*#__PURE__*/memo(function VideoPreview(_ref) {
30234
30246
  preload: 'auto',
30235
30247
  id: 'video',
30236
30248
  src: file.attachmentUrl || videoUrl
30237
- }), videoCurrentTime && !isRepliedMessage && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30249
+ }), videoCurrentTime && !isRepliedMessage && (!isDetailsView || !loading) && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30238
30250
  /*#__PURE__*/
30239
30251
  React__default.createElement(VideoPlayButton, null, /*#__PURE__*/React__default.createElement(SvgPlayVideo, null))), /*#__PURE__*/React__default.createElement(VideoTime, {
30240
30252
  isDetailsView: isDetailsView,
@@ -36679,7 +36691,7 @@ var Message$1 = function Message(_ref) {
36679
36691
  })) {
36680
36692
  if (message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
36681
36693
  return marker.name === MESSAGE_DELIVERY_STATUS.READ;
36682
- }) && message.incoming) {
36694
+ }) && message.incoming && !unreadScrollTo) {
36683
36695
  dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
36684
36696
  }
36685
36697
  }
@@ -36743,7 +36755,7 @@ var Message$1 = function Message(_ref) {
36743
36755
  removeMessageFromVisibleMessagesMap(message);
36744
36756
  }
36745
36757
  }
36746
- }, [isVisible]);
36758
+ }, [isVisible, unreadScrollTo]);
36747
36759
  useDidUpdate(function () {
36748
36760
  if (tabIsActive) {
36749
36761
  handleSendReadMarker();
@@ -38010,13 +38022,14 @@ var MessageList = function MessageList(_ref2) {
38010
38022
  if (scrollElement) {
38011
38023
  scrollElement.style.scrollBehavior = 'inherit';
38012
38024
  }
38025
+ setScrollIntoView(true);
38013
38026
  var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId);
38014
38027
  if (lastReadMessageNode && scrollElement) {
38028
+ dispatch(scrollToNewMessageAC(false));
38015
38029
  scrollElement.scrollTo({
38016
38030
  top: lastReadMessageNode.offsetTop - 200,
38017
- behavior: 'smooth'
38031
+ behavior: 'auto'
38018
38032
  });
38019
- setScrollIntoView(true);
38020
38033
  setTimeout(function () {
38021
38034
  dispatch(setUnreadScrollToAC(false));
38022
38035
  setScrollIntoView(false);
@@ -45066,7 +45079,7 @@ var Media = function Media(_ref) {
45066
45079
  })));
45067
45080
  };
45068
45081
  var Container$o = styled.div(_templateObject$V || (_templateObject$V = _taggedTemplateLiteralLoose(["\n padding: 6px 4px;\n overflow-x: hidden;\n overflow-y: auto;\n list-style: none;\n transition: all 0.2s;\n align-items: flex-start;\n display: flex;\n flex-wrap: wrap;\n"])));
45069
- var MediaItem = styled.div(_templateObject2$Q || (_templateObject2$Q = _taggedTemplateLiteralLoose(["\n width: calc(33.3333% - 4px);\n height: 110px;\n box-sizing: border-box;\n //border: 1px solid #ccc;\n border: 0.5px solid rgba(0, 0, 0, 0.1);\n border-radius: 8px;\n overflow: hidden;\n margin: 2px;\n"])));
45082
+ var MediaItem = styled.div(_templateObject2$Q || (_templateObject2$Q = _taggedTemplateLiteralLoose(["\n width: calc(33.3333% - 4px);\n aspect-ratio: 1/1;\n box-sizing: border-box;\n //border: 1px solid #ccc;\n border: 0.5px solid rgba(0, 0, 0, 0.1);\n border-radius: 8px;\n overflow: hidden;\n margin: 2px;\n"])));
45070
45083
 
45071
45084
  var _rect$3, _path$1u;
45072
45085
  function _extends$1y() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sceyt-chat-react-uikit",
3
- "version": "1.7.6-beta.7",
3
+ "version": "1.7.6-beta.9",
4
4
  "description": "Interactive React UI Components for Sceyt Chat.",
5
5
  "author": "Sceyt",
6
6
  "license": "MIT",