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

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 +18 -10
  2. package/index.modern.js +18 -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,17 @@ 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
+ setMappedAllMessages[msg.id] = msg;
20279
+ });
20280
+ _allMessages2.forEach(function (msg) {
20281
+ setMappedAllMessages[msg.id] = msg;
20282
+ });
20283
+ allMessagesAfterLastMessage = (_Object$values = Object.values(setMappedAllMessages)) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
20276
20284
  return msg.id > lastMessageId;
20277
20285
  });
20278
- updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage);
20286
+ updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage || []);
20279
20287
  setMessagesToMap(channel.id, updatedMessages);
20280
20288
  setAllMessages(updatedMessages);
20281
20289
  _context9.n = 44;
@@ -23965,7 +23973,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
23965
23973
  return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
23966
23974
  })) + " " + (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
23975
  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, {
23976
+ })) + " " + (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
23977
  poll: (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.pollDetails) && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.type) === exports.MESSAGE_TYPE.POLL
23970
23978
  }, 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
23979
  lastMessage: lastMessage
@@ -30235,7 +30243,7 @@ var VideoPreview = /*#__PURE__*/React.memo(function VideoPreview(_ref) {
30235
30243
  preload: 'auto',
30236
30244
  id: 'video',
30237
30245
  src: file.attachmentUrl || videoUrl
30238
- }), videoCurrentTime && !isRepliedMessage && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30246
+ }), videoCurrentTime && !isRepliedMessage && (!isDetailsView || !loading) && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30239
30247
  /*#__PURE__*/
30240
30248
  React__default.createElement(VideoPlayButton, null, /*#__PURE__*/React__default.createElement(SvgPlayVideo, null))), /*#__PURE__*/React__default.createElement(VideoTime, {
30241
30249
  isDetailsView: isDetailsView,
@@ -36680,7 +36688,7 @@ var Message$1 = function Message(_ref) {
36680
36688
  })) {
36681
36689
  if (message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
36682
36690
  return marker.name === MESSAGE_DELIVERY_STATUS.READ;
36683
- }) && message.incoming) {
36691
+ }) && message.incoming && !unreadScrollTo) {
36684
36692
  dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
36685
36693
  }
36686
36694
  }
@@ -36744,7 +36752,7 @@ var Message$1 = function Message(_ref) {
36744
36752
  removeMessageFromVisibleMessagesMap(message);
36745
36753
  }
36746
36754
  }
36747
- }, [isVisible]);
36755
+ }, [isVisible, unreadScrollTo]);
36748
36756
  useDidUpdate(function () {
36749
36757
  if (tabIsActive) {
36750
36758
  handleSendReadMarker();
@@ -38011,13 +38019,13 @@ var MessageList = function MessageList(_ref2) {
38011
38019
  if (scrollElement) {
38012
38020
  scrollElement.style.scrollBehavior = 'inherit';
38013
38021
  }
38022
+ setScrollIntoView(true);
38014
38023
  var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId);
38015
38024
  if (lastReadMessageNode && scrollElement) {
38016
38025
  scrollElement.scrollTo({
38017
38026
  top: lastReadMessageNode.offsetTop - 200,
38018
- behavior: 'smooth'
38027
+ behavior: 'auto'
38019
38028
  });
38020
- setScrollIntoView(true);
38021
38029
  setTimeout(function () {
38022
38030
  dispatch(setUnreadScrollToAC(false));
38023
38031
  setScrollIntoView(false);
@@ -45067,7 +45075,7 @@ var Media = function Media(_ref) {
45067
45075
  })));
45068
45076
  };
45069
45077
  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"])));
45078
+ 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
45079
 
45072
45080
  var _rect$3, _path$1u;
45073
45081
  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,17 @@ 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
+ setMappedAllMessages[msg.id] = msg;
20278
+ });
20279
+ _allMessages2.forEach(function (msg) {
20280
+ setMappedAllMessages[msg.id] = msg;
20281
+ });
20282
+ allMessagesAfterLastMessage = (_Object$values = Object.values(setMappedAllMessages)) === null || _Object$values === void 0 ? void 0 : _Object$values.filter(function (msg) {
20275
20283
  return msg.id > lastMessageId;
20276
20284
  });
20277
- updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage);
20285
+ updatedMessages = [].concat(updatedMessages, allMessagesAfterLastMessage || []);
20278
20286
  setMessagesToMap(channel.id, updatedMessages);
20279
20287
  setAllMessages(updatedMessages);
20280
20288
  _context9.n = 44;
@@ -23964,7 +23972,7 @@ var ChannelMessageText = function ChannelMessageText(_ref2) {
23964
23972
  return mem === user.id ? ' You' : " " + systemMessageUserName(mem, contactsMap && contactsMap[mem], lastMessage.mentionedUsers);
23965
23973
  })) + " " + (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
23974
  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, {
23975
+ })) + " " + (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
23976
  poll: (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.pollDetails) && (lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.type) === MESSAGE_TYPE.POLL
23969
23977
  }, 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
23978
  lastMessage: lastMessage
@@ -30234,7 +30242,7 @@ var VideoPreview = /*#__PURE__*/memo(function VideoPreview(_ref) {
30234
30242
  preload: 'auto',
30235
30243
  id: 'video',
30236
30244
  src: file.attachmentUrl || videoUrl
30237
- }), videoCurrentTime && !isRepliedMessage && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30245
+ }), videoCurrentTime && !isRepliedMessage && (!isDetailsView || !loading) && (/*#__PURE__*/React__default.createElement(VideoControls, null, !isPreview && !!videoCurrentTime && !isRepliedMessage && !uploading && !isDetailsView && (
30238
30246
  /*#__PURE__*/
30239
30247
  React__default.createElement(VideoPlayButton, null, /*#__PURE__*/React__default.createElement(SvgPlayVideo, null))), /*#__PURE__*/React__default.createElement(VideoTime, {
30240
30248
  isDetailsView: isDetailsView,
@@ -36679,7 +36687,7 @@ var Message$1 = function Message(_ref) {
36679
36687
  })) {
36680
36688
  if (message.userMarkers && message.userMarkers.length && message.userMarkers.find(function (marker) {
36681
36689
  return marker.name === MESSAGE_DELIVERY_STATUS.READ;
36682
- }) && message.incoming) {
36690
+ }) && message.incoming && !unreadScrollTo) {
36683
36691
  dispatch(markMessagesAsDeliveredAC(channel.id, [message.id]));
36684
36692
  }
36685
36693
  }
@@ -36743,7 +36751,7 @@ var Message$1 = function Message(_ref) {
36743
36751
  removeMessageFromVisibleMessagesMap(message);
36744
36752
  }
36745
36753
  }
36746
- }, [isVisible]);
36754
+ }, [isVisible, unreadScrollTo]);
36747
36755
  useDidUpdate(function () {
36748
36756
  if (tabIsActive) {
36749
36757
  handleSendReadMarker();
@@ -38010,13 +38018,13 @@ var MessageList = function MessageList(_ref2) {
38010
38018
  if (scrollElement) {
38011
38019
  scrollElement.style.scrollBehavior = 'inherit';
38012
38020
  }
38021
+ setScrollIntoView(true);
38013
38022
  var lastReadMessageNode = document.getElementById(channel.lastDisplayedMessageId);
38014
38023
  if (lastReadMessageNode && scrollElement) {
38015
38024
  scrollElement.scrollTo({
38016
38025
  top: lastReadMessageNode.offsetTop - 200,
38017
- behavior: 'smooth'
38026
+ behavior: 'auto'
38018
38027
  });
38019
- setScrollIntoView(true);
38020
38028
  setTimeout(function () {
38021
38029
  dispatch(setUnreadScrollToAC(false));
38022
38030
  setScrollIntoView(false);
@@ -45066,7 +45074,7 @@ var Media = function Media(_ref) {
45066
45074
  })));
45067
45075
  };
45068
45076
  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"])));
45077
+ 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
45078
 
45071
45079
  var _rect$3, _path$1u;
45072
45080
  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.8",
4
4
  "description": "Interactive React UI Components for Sceyt Chat.",
5
5
  "author": "Sceyt",
6
6
  "license": "MIT",