sceyt-chat-react-uikit 1.7.1-beta.10 → 1.7.1-beta.12

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 (5) hide show
  1. package/components/Channel/index.d.ts +21 -1
  2. package/components/ChannelList/index.d.ts +4 -1
  3. package/index.js +120 -47
  4. package/index.modern.js +120 -47
  5. package/package.json +1 -1
package/components/Channel/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { IChannel, IContact } from '../../types';
2
+ import { IChannel, IContact, IMessage, IUser } from '../../types';
3
3
  interface IChannelProps {
4
4
  channel: IChannel;
5
5
  showAvatar?: boolean;
@@ -26,6 +26,26 @@ interface IChannelProps {
26
26
  channelLastMessageTimeFontSize?: string;
27
27
  channelAvatarSize?: number;
28
28
  channelAvatarTextSize?: number;
29
+ setSelectedChannel: (channel: IChannel) => void;
30
+ getCustomLatestMessage?: (args: {
31
+ lastMessage: IMessage;
32
+ typingOrRecording: any;
33
+ draftMessageText: any;
34
+ textSecondary: string;
35
+ channel: IChannel;
36
+ channelLastMessageFontSize: string;
37
+ channelLastMessageHeight: string;
38
+ isDirectChannel: boolean;
39
+ textPrimary: string;
40
+ messageAuthorRef: any;
41
+ contactsMap: {
42
+ [key: string]: IContact;
43
+ };
44
+ getFromContacts: boolean;
45
+ warningColor: string;
46
+ user: IUser;
47
+ MessageText: any;
48
+ }) => any;
29
49
  }
30
50
  declare const Channel: React.FC<IChannelProps>;
31
51
  export default Channel;
package/components/ChannelList/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import React, { FC } from 'react';
2
- import { IChannel, IContact } from '../../types';
2
+ import { IChannel, IContact, IMessage, IUser } from '../../types';
3
3
  interface IChannelListProps {
4
4
  List?: FC<{
5
5
  channels: IChannel[];
@@ -74,6 +74,9 @@ interface IChannelListProps {
74
74
  onChannelHidden?: (channelList: IChannel[], hiddenChannel: IChannel, setChannels: (updatedChannelList: IChannel[]) => void) => void;
75
75
  onChannelVisible?: (channelList: IChannel[], visibleChannel: IChannel, setChannels: (updatedChannelList: IChannel[]) => void) => void;
76
76
  onAddedToChannel?: (channelList: IChannel[], channel: IChannel, setChannels: (updatedChannelList: IChannel[]) => void) => void;
77
+ getCustomLatestMessage?: (lastMessage: IMessage, typingOrRecording: any, draftMessageText: any, textSecondary: string, channel: IChannel, channelLastMessageFontSize: string, channelLastMessageHeight: string, isDirectChannel: boolean, textPrimary: string, messageAuthorRef: any, contactsMap: {
78
+ [key: string]: IContact;
79
+ }, getFromContacts: boolean, warningColor: string, user: IUser, MessageText: any) => any;
77
80
  }
78
81
  declare const ChannelList: React.FC<IChannelListProps>;
79
82
  export default ChannelList;
package/index.js CHANGED
@@ -18829,7 +18829,7 @@ function getMessagesQuery(action) {
18829
18829
  }, _marked7$1, null, [[0, 49, 50, 52]]);
18830
18830
  }
18831
18831
  function getMessageQuery(action) {
18832
- var payload, channelId, messageId, channel, messages, _t0;
18832
+ var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
18833
18833
  return _regenerator().w(function (_context0) {
18834
18834
  while (1) switch (_context0.p = _context0.n) {
18835
18835
  case 0:
@@ -18837,34 +18837,47 @@ function getMessageQuery(action) {
18837
18837
  payload = action.payload;
18838
18838
  channelId = payload.channelId, messageId = payload.messageId;
18839
18839
  _context0.n = 1;
18840
- return effects.call(getChannelFromMap, channelId);
18840
+ return effects.call(getChannelFromAllChannels, channelId);
18841
18841
  case 1:
18842
18842
  channel = _context0.v;
18843
18843
  _context0.n = 2;
18844
18844
  return effects.call(channel.getMessagesById, [messageId]);
18845
18845
  case 2:
18846
18846
  messages = _context0.v;
18847
+ fetchedMessage = messages && messages[0] ? JSON.parse(JSON.stringify(messages[0])) : null;
18848
+ if (!fetchedMessage) {
18849
+ _context0.n = 5;
18850
+ break;
18851
+ }
18847
18852
  _context0.n = 3;
18848
- return effects.put(updateMessageAC(messageId, messages[0]));
18853
+ return effects.put(updateMessageAC(messageId, fetchedMessage));
18849
18854
  case 3:
18850
18855
  updateMessageOnMap(channel.id, {
18851
18856
  messageId: messageId,
18852
- params: messages[0]
18857
+ params: fetchedMessage
18853
18858
  });
18854
- updateMessageOnAllMessages(messageId, messages[0]);
18859
+ updateMessageOnAllMessages(messageId, fetchedMessage);
18855
18860
  _context0.n = 4;
18856
18861
  return effects.put(setScrollToMessagesAC(messageId, false));
18857
18862
  case 4:
18858
- _context0.n = 6;
18859
- break;
18863
+ if (!(channel.lastMessage && channel.lastMessage.id === messageId)) {
18864
+ _context0.n = 5;
18865
+ break;
18866
+ }
18867
+ updateChannelLastMessageOnAllChannels(channel.id, fetchedMessage);
18868
+ _context0.n = 5;
18869
+ return effects.put(updateChannelLastMessageAC(fetchedMessage, channel));
18860
18870
  case 5:
18861
- _context0.p = 5;
18871
+ _context0.n = 7;
18872
+ break;
18873
+ case 6:
18874
+ _context0.p = 6;
18862
18875
  _t0 = _context0.v;
18863
18876
  log.error('error in message query', _t0);
18864
- case 6:
18877
+ case 7:
18865
18878
  return _context0.a(2);
18866
18879
  }
18867
- }, _marked8$1, null, [[0, 5]]);
18880
+ }, _marked8$1, null, [[0, 6]]);
18868
18881
  }
18869
18882
  function loadMoreMessages(action) {
18870
18883
  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t1;
@@ -19395,7 +19408,7 @@ function MessageSaga() {
19395
19408
  return effects.takeLatest(GET_MESSAGES, getMessagesQuery);
19396
19409
  case 7:
19397
19410
  _context18.n = 8;
19398
- return effects.takeLatest(GET_MESSAGE, getMessageQuery);
19411
+ return effects.takeEvery(GET_MESSAGE, getMessageQuery);
19399
19412
  case 8:
19400
19413
  _context18.n = 9;
19401
19414
  return effects.takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);
@@ -21164,7 +21177,9 @@ var Channel = function Channel(_ref3) {
21164
21177
  channelLastMessageTimeFontSize = _ref3.channelLastMessageTimeFontSize,
21165
21178
  channelLastMessageHeight = _ref3.channelLastMessageHeight,
21166
21179
  channelAvatarSize = _ref3.channelAvatarSize,
21167
- channelAvatarTextSize = _ref3.channelAvatarTextSize;
21180
+ channelAvatarTextSize = _ref3.channelAvatarTextSize,
21181
+ setSelectedChannel = _ref3.setSelectedChannel,
21182
+ getCustomLatestMessage = _ref3.getCustomLatestMessage;
21168
21183
  var _useColor = useColors(),
21169
21184
  accentColor = _useColor[THEME_COLORS.ACCENT],
21170
21185
  textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -21202,13 +21217,6 @@ var Channel = function Channel(_ref3) {
21202
21217
  statusWidth = _useState3[0],
21203
21218
  setStatusWidth = _useState3[1];
21204
21219
  var avatarName = channel.subject || (isDirectChannel && directChannelUser ? directChannelUser.firstName || directChannelUser.id : isSelfChannel ? 'Me' : '');
21205
- var handleChangeActiveChannel = function handleChangeActiveChannel(chan) {
21206
- if (activeChannel.id !== chan.id) {
21207
- dispatch(sendTypingAC(false));
21208
- dispatch(clearMessagesAC());
21209
- dispatch(switchChannelActionAC(chan));
21210
- }
21211
- };
21212
21220
  var messageAuthorRef = React.useRef(null);
21213
21221
  var messageTimeAndStatusRef = React.useRef(null);
21214
21222
  useUpdatePresence(channel, true);
@@ -21293,6 +21301,40 @@ var Channel = function Channel(_ref3) {
21293
21301
  isDirectChannel: isDirectChannel
21294
21302
  });
21295
21303
  }, [typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isTyping, typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isRecording, draftMessageText, lastMessage, user, contactsMap, getFromContacts, lastMessageMetas, accentColor, typingOrRecording, channel, isDirectChannel]);
21304
+ var getCustomLatestMessageComponent = React.useCallback(function (_ref4) {
21305
+ var lastMessage = _ref4.lastMessage,
21306
+ typingOrRecording = _ref4.typingOrRecording,
21307
+ draftMessageText = _ref4.draftMessageText,
21308
+ textSecondary = _ref4.textSecondary,
21309
+ channel = _ref4.channel,
21310
+ channelLastMessageFontSize = _ref4.channelLastMessageFontSize,
21311
+ channelLastMessageHeight = _ref4.channelLastMessageHeight,
21312
+ isDirectChannel = _ref4.isDirectChannel,
21313
+ textPrimary = _ref4.textPrimary,
21314
+ messageAuthorRef = _ref4.messageAuthorRef,
21315
+ contactsMap = _ref4.contactsMap,
21316
+ getFromContacts = _ref4.getFromContacts,
21317
+ warningColor = _ref4.warningColor,
21318
+ user = _ref4.user,
21319
+ MessageText = _ref4.MessageText;
21320
+ return getCustomLatestMessage && getCustomLatestMessage({
21321
+ lastMessage: lastMessage,
21322
+ typingOrRecording: typingOrRecording,
21323
+ draftMessageText: draftMessageText,
21324
+ textSecondary: textSecondary,
21325
+ channel: channel,
21326
+ channelLastMessageFontSize: channelLastMessageFontSize,
21327
+ channelLastMessageHeight: channelLastMessageHeight,
21328
+ isDirectChannel: isDirectChannel,
21329
+ textPrimary: textPrimary,
21330
+ messageAuthorRef: messageAuthorRef,
21331
+ contactsMap: contactsMap,
21332
+ getFromContacts: getFromContacts,
21333
+ warningColor: warningColor,
21334
+ user: user,
21335
+ MessageText: MessageText
21336
+ });
21337
+ }, [getCustomLatestMessage, lastMessage, typingOrRecording, draftMessageText, textSecondary, channel, channelLastMessageFontSize, channelLastMessageHeight, isDirectChannel, textPrimary, messageAuthorRef, contactsMap, getFromContacts, warningColor, user, MessageText]);
21296
21338
  return /*#__PURE__*/React__default.createElement(Container$2, {
21297
21339
  theme: theme,
21298
21340
  selectedChannel: channel.id === activeChannel.id,
@@ -21303,7 +21345,7 @@ var Channel = function Channel(_ref3) {
21303
21345
  selectedChannelBorderRadius: selectedChannelBorderRadius,
21304
21346
  channelsMargin: channelsMargin,
21305
21347
  onClick: function onClick() {
21306
- return handleChangeActiveChannel(channel);
21348
+ return setSelectedChannel(channel);
21307
21349
  },
21308
21350
  hoverBackground: channelHoverBackground || backgroundHovered
21309
21351
  }, showAvatar && (/*#__PURE__*/React__default.createElement(AvatarWrapper, null, /*#__PURE__*/React__default.createElement(Avatar, {
@@ -21329,7 +21371,23 @@ var Channel = function Channel(_ref3) {
21329
21371
  avatarSize: channelAvatarSize
21330
21372
  }, /*#__PURE__*/React__default.createElement("h3", null, channel.subject || (isDirectChannel && directChannelUser ? makeUsername(contactsMap && contactsMap[directChannelUser.id], directChannelUser, getFromContacts) : isSelfChannel ? 'Me' : '')), channel.muted && (/*#__PURE__*/React__default.createElement(MutedIcon, {
21331
21373
  color: notificationsIsMutedIconColor || iconInactive
21332
- }, notificationsIsMutedIcon || /*#__PURE__*/React__default.createElement(SvgUnmuteNotifications, null))), (lastMessage || typingOrRecording.items.length > 0 || draftMessageText) && (/*#__PURE__*/React__default.createElement(LastMessage, {
21374
+ }, notificationsIsMutedIcon || /*#__PURE__*/React__default.createElement(SvgUnmuteNotifications, null))), getCustomLatestMessage ? getCustomLatestMessageComponent({
21375
+ lastMessage: lastMessage,
21376
+ typingOrRecording: typingOrRecording,
21377
+ draftMessageText: draftMessageText,
21378
+ textSecondary: textSecondary,
21379
+ channel: channel,
21380
+ channelLastMessageFontSize: channelLastMessageFontSize || '14px',
21381
+ channelLastMessageHeight: channelLastMessageHeight || '20px',
21382
+ isDirectChannel: isDirectChannel,
21383
+ textPrimary: textPrimary,
21384
+ messageAuthorRef: messageAuthorRef,
21385
+ contactsMap: contactsMap || {},
21386
+ getFromContacts: getFromContacts,
21387
+ warningColor: warningColor,
21388
+ user: user,
21389
+ MessageText: MessageText
21390
+ }) : (lastMessage || typingOrRecording.items.length > 0 || draftMessageText) && (/*#__PURE__*/React__default.createElement(LastMessage, {
21333
21391
  color: textSecondary,
21334
21392
  markedAsUnread: !!(channel.unread || channel.newMessageCount && channel.newMessageCount > 0),
21335
21393
  unreadMentions: !!(channel.newMentionCount && channel.newMentionCount > 0),
@@ -21432,9 +21490,9 @@ var Container$2 = styled__default.div(_templateObject6$1 || (_templateObject6$1
21432
21490
  return props.channelsMargin || '0 8px';
21433
21491
  }, function (props) {
21434
21492
  return props.selectedChannelBorderRadius || '12px';
21435
- }, function (_ref4) {
21436
- var selectedChannel = _ref4.selectedChannel,
21437
- hoverBackground = _ref4.hoverBackground;
21493
+ }, function (_ref5) {
21494
+ var selectedChannel = _ref5.selectedChannel,
21495
+ hoverBackground = _ref5.hoverBackground;
21438
21496
  return !selectedChannel && "\n background-color: " + hoverBackground + ";\n ";
21439
21497
  }, UserStatus, function (props) {
21440
21498
  return props.selectedChannel ? props.selectedBackgroundColor : props.hoverBackground;
@@ -21449,9 +21507,9 @@ var DraftMessageText = styled__default.span(_templateObject8$1 || (_templateObje
21449
21507
  });
21450
21508
  var LastMessageAuthor = styled__default.div(_templateObject9$1 || (_templateObject9$1 = _taggedTemplateLiteralLoose(["\n max-width: 120px;\n font-weight: 500;\n color: ", ";\n\n ", "\n & > span {\n display: block;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n max-width: 100%;\n }\n"])), function (props) {
21451
21509
  return props.color;
21452
- }, function (_ref5) {
21453
- var typing = _ref5.typing,
21454
- recording = _ref5.recording;
21510
+ }, function (_ref6) {
21511
+ var typing = _ref6.typing,
21512
+ recording = _ref6.recording;
21455
21513
  return (typing || recording) && "\n font-weight: 500;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n max-width: calc(100% - " + (typing ? 62 : 76) + "px);\n ";
21456
21514
  });
21457
21515
  var Points = styled__default.span(_templateObject0$1 || (_templateObject0$1 = _taggedTemplateLiteralLoose(["\n margin-right: 4px;\n color: ", ";\n font-style: normal;\n"])), function (props) {
@@ -23369,7 +23427,8 @@ var ChannelList = function ChannelList(_ref) {
23369
23427
  channelAvatarTextSize = _ref.channelAvatarTextSize,
23370
23428
  searchChannelInputFontSize = _ref.searchChannelInputFontSize,
23371
23429
  searchedChannelsTitleFontSize = _ref.searchedChannelsTitleFontSize,
23372
- searchChannelsPadding = _ref.searchChannelsPadding;
23430
+ searchChannelsPadding = _ref.searchChannelsPadding,
23431
+ getCustomLatestMessage = _ref.getCustomLatestMessage;
23373
23432
  var _useColor = useColors(),
23374
23433
  background = _useColor[THEME_COLORS.BACKGROUND],
23375
23434
  textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -23437,11 +23496,6 @@ var ChannelList = function ChannelList(_ref) {
23437
23496
  handleLoadMoreChannels();
23438
23497
  }
23439
23498
  };
23440
- var handleChangeActiveChannel = function handleChangeActiveChannel(chan) {
23441
- if (activeChannel.id !== chan.id) {
23442
- dispatch(switchChannelActionAC(chan));
23443
- }
23444
- };
23445
23499
  var handleCrateChatWithContact = function handleCrateChatWithContact(contact) {
23446
23500
  if (contact) {
23447
23501
  var channelData = {
@@ -23597,6 +23651,13 @@ var ChannelList = function ChannelList(_ref) {
23597
23651
  setListWidthIsSet(false);
23598
23652
  }
23599
23653
  }, [channels]);
23654
+ var setSelectedChannel = function setSelectedChannel(channel) {
23655
+ if (activeChannel.id !== channel.id) {
23656
+ dispatch(sendTypingAC(false));
23657
+ dispatch(clearMessagesAC());
23658
+ dispatch(switchChannelActionAC(channel));
23659
+ }
23660
+ };
23600
23661
  return /*#__PURE__*/React__default.createElement(Container$7, {
23601
23662
  className: className,
23602
23663
  withCustomList: !!List,
@@ -23641,13 +23702,13 @@ var ChannelList = function ChannelList(_ref) {
23641
23702
  channels: channels,
23642
23703
  searchedChannels: searchedChannels,
23643
23704
  selectedChannel: activeChannel,
23644
- setSelectedChannel: handleChangeActiveChannel,
23705
+ setSelectedChannel: setSelectedChannel,
23645
23706
  loadMoreChannels: handleLoadMoreChannels,
23646
23707
  searchValue: searchValue
23647
23708
  }, !searchValue ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, channels.map(function (channel) {
23648
23709
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23649
23710
  channel: channel,
23650
- setSelectedChannel: handleChangeActiveChannel,
23711
+ setSelectedChannel: setSelectedChannel,
23651
23712
  key: channel.id
23652
23713
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23653
23714
  theme: theme,
@@ -23673,7 +23734,9 @@ var ChannelList = function ChannelList(_ref) {
23673
23734
  avatarBorderRadius: avatarBorderRadius,
23674
23735
  channel: channel,
23675
23736
  key: channel.id,
23676
- contactsMap: contactsMap
23737
+ contactsMap: contactsMap,
23738
+ setSelectedChannel: setSelectedChannel,
23739
+ getCustomLatestMessage: getCustomLatestMessage
23677
23740
  }));
23678
23741
  }))) : channelsLoading === LOADING_STATE.LOADED && searchValue ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$cha = searchedChannels.chats_groups) !== null && _searchedChannels$cha !== void 0 && _searchedChannels$cha.length || searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$cha2 = searchedChannels.channels) !== null && _searchedChannels$cha2 !== void 0 && _searchedChannels$cha2.length || searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$con = searchedChannels.contacts) !== null && _searchedChannels$con !== void 0 && _searchedChannels$con.length ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, !!(searchedChannels.chats_groups && searchedChannels.chats_groups.length) && (/*#__PURE__*/React__default.createElement(DirectChannels, null, /*#__PURE__*/React__default.createElement(SearchedChannelsHeader, {
23679
23742
  color: textSecondary,
@@ -23681,7 +23744,7 @@ var ChannelList = function ChannelList(_ref) {
23681
23744
  }, "Chats & Groups"), searchedChannels.chats_groups.map(function (channel) {
23682
23745
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23683
23746
  channel: channel,
23684
- setSelectedChannel: handleChangeActiveChannel,
23747
+ setSelectedChannel: setSelectedChannel,
23685
23748
  key: channel.id
23686
23749
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23687
23750
  theme: theme,
@@ -23707,7 +23770,9 @@ var ChannelList = function ChannelList(_ref) {
23707
23770
  avatarBorderRadius: avatarBorderRadius,
23708
23771
  channel: channel,
23709
23772
  key: channel.id,
23710
- contactsMap: contactsMap
23773
+ contactsMap: contactsMap,
23774
+ setSelectedChannel: setSelectedChannel,
23775
+ getCustomLatestMessage: getCustomLatestMessage
23711
23776
  }));
23712
23777
  }))), !!(searchedChannels.contacts && searchedChannels.contacts.length) && (/*#__PURE__*/React__default.createElement(GroupChannels, null, /*#__PURE__*/React__default.createElement(SearchedChannelsHeader, {
23713
23778
  color: textSecondary,
@@ -23716,7 +23781,7 @@ var ChannelList = function ChannelList(_ref) {
23716
23781
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23717
23782
  contact: contact,
23718
23783
  createChatWithContact: handleCrateChatWithContact,
23719
- setSelectedChannel: handleChangeActiveChannel,
23784
+ setSelectedChannel: setSelectedChannel,
23720
23785
  key: contact.id
23721
23786
  })) : (/*#__PURE__*/React__default.createElement(ContactItem, {
23722
23787
  theme: theme,
@@ -23747,7 +23812,7 @@ var ChannelList = function ChannelList(_ref) {
23747
23812
  }, "Channels"), searchedChannels.channels.map(function (channel) {
23748
23813
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23749
23814
  channel: channel,
23750
- setSelectedChannel: handleChangeActiveChannel,
23815
+ setSelectedChannel: setSelectedChannel,
23751
23816
  key: channel.id
23752
23817
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23753
23818
  theme: theme,
@@ -23773,7 +23838,9 @@ var ChannelList = function ChannelList(_ref) {
23773
23838
  avatarBorderRadius: avatarBorderRadius,
23774
23839
  channel: channel,
23775
23840
  key: channel.id,
23776
- contactsMap: contactsMap
23841
+ contactsMap: contactsMap,
23842
+ setSelectedChannel: setSelectedChannel,
23843
+ getCustomLatestMessage: getCustomLatestMessage
23777
23844
  }));
23778
23845
  }))))) : (/*#__PURE__*/React__default.createElement(NoData, {
23779
23846
  color: textSecondary,
@@ -23794,7 +23861,7 @@ var ChannelList = function ChannelList(_ref) {
23794
23861
  }, channels.map(function (channel) {
23795
23862
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23796
23863
  channel: channel,
23797
- setSelectedChannel: handleChangeActiveChannel,
23864
+ setSelectedChannel: setSelectedChannel,
23798
23865
  key: channel.id
23799
23866
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23800
23867
  theme: theme,
@@ -23820,7 +23887,9 @@ var ChannelList = function ChannelList(_ref) {
23820
23887
  avatarBorderRadius: avatarBorderRadius,
23821
23888
  channel: channel,
23822
23889
  key: channel.id,
23823
- contactsMap: contactsMap
23890
+ contactsMap: contactsMap,
23891
+ setSelectedChannel: setSelectedChannel,
23892
+ getCustomLatestMessage: getCustomLatestMessage
23824
23893
  }));
23825
23894
  }))), !!searchValue && (channelsLoading === LOADING_STATE.LOADED ? !((_searchedChannels$cha4 = searchedChannels.chats_groups) !== null && _searchedChannels$cha4 !== void 0 && _searchedChannels$cha4.length) && !((_searchedChannels$cha5 = searchedChannels.chats_groups) !== null && _searchedChannels$cha5 !== void 0 && _searchedChannels$cha5.length) && !((_searchedChannels$cha6 = searchedChannels.channels) !== null && _searchedChannels$cha6 !== void 0 && _searchedChannels$cha6.length) ? (/*#__PURE__*/React__default.createElement(NoData, {
23826
23895
  color: textSecondary,
@@ -23831,7 +23900,7 @@ var ChannelList = function ChannelList(_ref) {
23831
23900
  }, "Chats & Groups"), searchedChannels.chats_groups.map(function (channel) {
23832
23901
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23833
23902
  channel: channel,
23834
- setSelectedChannel: handleChangeActiveChannel,
23903
+ setSelectedChannel: setSelectedChannel,
23835
23904
  key: channel.id
23836
23905
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23837
23906
  theme: theme,
@@ -23857,7 +23926,9 @@ var ChannelList = function ChannelList(_ref) {
23857
23926
  avatarBorderRadius: avatarBorderRadius,
23858
23927
  channel: channel,
23859
23928
  contactsMap: contactsMap,
23860
- key: channel.id
23929
+ key: channel.id,
23930
+ setSelectedChannel: setSelectedChannel,
23931
+ getCustomLatestMessage: getCustomLatestMessage
23861
23932
  }));
23862
23933
  }))), !!searchedChannels.channels.length && (/*#__PURE__*/React__default.createElement(GroupChannels, null, /*#__PURE__*/React__default.createElement(SearchedChannelsHeader, {
23863
23934
  color: textSecondary,
@@ -23865,7 +23936,7 @@ var ChannelList = function ChannelList(_ref) {
23865
23936
  }, "Channels"), searchedChannels.channels.map(function (channel) {
23866
23937
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23867
23938
  channel: channel,
23868
- setSelectedChannel: handleChangeActiveChannel,
23939
+ setSelectedChannel: setSelectedChannel,
23869
23940
  key: channel.id
23870
23941
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23871
23942
  theme: theme,
@@ -23891,7 +23962,9 @@ var ChannelList = function ChannelList(_ref) {
23891
23962
  avatarBorderRadius: avatarBorderRadius,
23892
23963
  channel: channel,
23893
23964
  key: channel.id,
23894
- contactsMap: contactsMap
23965
+ contactsMap: contactsMap,
23966
+ setSelectedChannel: setSelectedChannel,
23967
+ getCustomLatestMessage: getCustomLatestMessage
23895
23968
  }));
23896
23969
  }))))) : (/*#__PURE__*/React__default.createElement(LoadingWrapper, null, /*#__PURE__*/React__default.createElement(UploadingIcon, {
23897
23970
  color: textFootnote
package/index.modern.js CHANGED
@@ -18808,7 +18808,7 @@ function getMessagesQuery(action) {
18808
18808
  }, _marked7$1, null, [[0, 49, 50, 52]]);
18809
18809
  }
18810
18810
  function getMessageQuery(action) {
18811
- var payload, channelId, messageId, channel, messages, _t0;
18811
+ var payload, channelId, messageId, channel, messages, fetchedMessage, _t0;
18812
18812
  return _regenerator().w(function (_context0) {
18813
18813
  while (1) switch (_context0.p = _context0.n) {
18814
18814
  case 0:
@@ -18816,34 +18816,47 @@ function getMessageQuery(action) {
18816
18816
  payload = action.payload;
18817
18817
  channelId = payload.channelId, messageId = payload.messageId;
18818
18818
  _context0.n = 1;
18819
- return call(getChannelFromMap, channelId);
18819
+ return call(getChannelFromAllChannels, channelId);
18820
18820
  case 1:
18821
18821
  channel = _context0.v;
18822
18822
  _context0.n = 2;
18823
18823
  return call(channel.getMessagesById, [messageId]);
18824
18824
  case 2:
18825
18825
  messages = _context0.v;
18826
+ fetchedMessage = messages && messages[0] ? JSON.parse(JSON.stringify(messages[0])) : null;
18827
+ if (!fetchedMessage) {
18828
+ _context0.n = 5;
18829
+ break;
18830
+ }
18826
18831
  _context0.n = 3;
18827
- return put(updateMessageAC(messageId, messages[0]));
18832
+ return put(updateMessageAC(messageId, fetchedMessage));
18828
18833
  case 3:
18829
18834
  updateMessageOnMap(channel.id, {
18830
18835
  messageId: messageId,
18831
- params: messages[0]
18836
+ params: fetchedMessage
18832
18837
  });
18833
- updateMessageOnAllMessages(messageId, messages[0]);
18838
+ updateMessageOnAllMessages(messageId, fetchedMessage);
18834
18839
  _context0.n = 4;
18835
18840
  return put(setScrollToMessagesAC(messageId, false));
18836
18841
  case 4:
18837
- _context0.n = 6;
18838
- break;
18842
+ if (!(channel.lastMessage && channel.lastMessage.id === messageId)) {
18843
+ _context0.n = 5;
18844
+ break;
18845
+ }
18846
+ updateChannelLastMessageOnAllChannels(channel.id, fetchedMessage);
18847
+ _context0.n = 5;
18848
+ return put(updateChannelLastMessageAC(fetchedMessage, channel));
18839
18849
  case 5:
18840
- _context0.p = 5;
18850
+ _context0.n = 7;
18851
+ break;
18852
+ case 6:
18853
+ _context0.p = 6;
18841
18854
  _t0 = _context0.v;
18842
18855
  log.error('error in message query', _t0);
18843
- case 6:
18856
+ case 7:
18844
18857
  return _context0.a(2);
18845
18858
  }
18846
- }, _marked8$1, null, [[0, 5]]);
18859
+ }, _marked8$1, null, [[0, 6]]);
18847
18860
  }
18848
18861
  function loadMoreMessages(action) {
18849
18862
  var payload, limit, direction, channelId, messageId, hasNext, SceytChatClient, messageQueryBuilder, messageQuery, result, _t1;
@@ -19374,7 +19387,7 @@ function MessageSaga() {
19374
19387
  return takeLatest(GET_MESSAGES, getMessagesQuery);
19375
19388
  case 7:
19376
19389
  _context18.n = 8;
19377
- return takeLatest(GET_MESSAGE, getMessageQuery);
19390
+ return takeEvery(GET_MESSAGE, getMessageQuery);
19378
19391
  case 8:
19379
19392
  _context18.n = 9;
19380
19393
  return takeLatest(GET_MESSAGES_ATTACHMENTS, getMessageAttachments);
@@ -21143,7 +21156,9 @@ var Channel = function Channel(_ref3) {
21143
21156
  channelLastMessageTimeFontSize = _ref3.channelLastMessageTimeFontSize,
21144
21157
  channelLastMessageHeight = _ref3.channelLastMessageHeight,
21145
21158
  channelAvatarSize = _ref3.channelAvatarSize,
21146
- channelAvatarTextSize = _ref3.channelAvatarTextSize;
21159
+ channelAvatarTextSize = _ref3.channelAvatarTextSize,
21160
+ setSelectedChannel = _ref3.setSelectedChannel,
21161
+ getCustomLatestMessage = _ref3.getCustomLatestMessage;
21147
21162
  var _useColor = useColors(),
21148
21163
  accentColor = _useColor[THEME_COLORS.ACCENT],
21149
21164
  textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -21181,13 +21196,6 @@ var Channel = function Channel(_ref3) {
21181
21196
  statusWidth = _useState3[0],
21182
21197
  setStatusWidth = _useState3[1];
21183
21198
  var avatarName = channel.subject || (isDirectChannel && directChannelUser ? directChannelUser.firstName || directChannelUser.id : isSelfChannel ? 'Me' : '');
21184
- var handleChangeActiveChannel = function handleChangeActiveChannel(chan) {
21185
- if (activeChannel.id !== chan.id) {
21186
- dispatch(sendTypingAC(false));
21187
- dispatch(clearMessagesAC());
21188
- dispatch(switchChannelActionAC(chan));
21189
- }
21190
- };
21191
21199
  var messageAuthorRef = useRef(null);
21192
21200
  var messageTimeAndStatusRef = useRef(null);
21193
21201
  useUpdatePresence(channel, true);
@@ -21272,6 +21280,40 @@ var Channel = function Channel(_ref3) {
21272
21280
  isDirectChannel: isDirectChannel
21273
21281
  });
21274
21282
  }, [typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isTyping, typingOrRecording === null || typingOrRecording === void 0 ? void 0 : typingOrRecording.isRecording, draftMessageText, lastMessage, user, contactsMap, getFromContacts, lastMessageMetas, accentColor, typingOrRecording, channel, isDirectChannel]);
21283
+ var getCustomLatestMessageComponent = useCallback(function (_ref4) {
21284
+ var lastMessage = _ref4.lastMessage,
21285
+ typingOrRecording = _ref4.typingOrRecording,
21286
+ draftMessageText = _ref4.draftMessageText,
21287
+ textSecondary = _ref4.textSecondary,
21288
+ channel = _ref4.channel,
21289
+ channelLastMessageFontSize = _ref4.channelLastMessageFontSize,
21290
+ channelLastMessageHeight = _ref4.channelLastMessageHeight,
21291
+ isDirectChannel = _ref4.isDirectChannel,
21292
+ textPrimary = _ref4.textPrimary,
21293
+ messageAuthorRef = _ref4.messageAuthorRef,
21294
+ contactsMap = _ref4.contactsMap,
21295
+ getFromContacts = _ref4.getFromContacts,
21296
+ warningColor = _ref4.warningColor,
21297
+ user = _ref4.user,
21298
+ MessageText = _ref4.MessageText;
21299
+ return getCustomLatestMessage && getCustomLatestMessage({
21300
+ lastMessage: lastMessage,
21301
+ typingOrRecording: typingOrRecording,
21302
+ draftMessageText: draftMessageText,
21303
+ textSecondary: textSecondary,
21304
+ channel: channel,
21305
+ channelLastMessageFontSize: channelLastMessageFontSize,
21306
+ channelLastMessageHeight: channelLastMessageHeight,
21307
+ isDirectChannel: isDirectChannel,
21308
+ textPrimary: textPrimary,
21309
+ messageAuthorRef: messageAuthorRef,
21310
+ contactsMap: contactsMap,
21311
+ getFromContacts: getFromContacts,
21312
+ warningColor: warningColor,
21313
+ user: user,
21314
+ MessageText: MessageText
21315
+ });
21316
+ }, [getCustomLatestMessage, lastMessage, typingOrRecording, draftMessageText, textSecondary, channel, channelLastMessageFontSize, channelLastMessageHeight, isDirectChannel, textPrimary, messageAuthorRef, contactsMap, getFromContacts, warningColor, user, MessageText]);
21275
21317
  return /*#__PURE__*/React__default.createElement(Container$2, {
21276
21318
  theme: theme,
21277
21319
  selectedChannel: channel.id === activeChannel.id,
@@ -21282,7 +21324,7 @@ var Channel = function Channel(_ref3) {
21282
21324
  selectedChannelBorderRadius: selectedChannelBorderRadius,
21283
21325
  channelsMargin: channelsMargin,
21284
21326
  onClick: function onClick() {
21285
- return handleChangeActiveChannel(channel);
21327
+ return setSelectedChannel(channel);
21286
21328
  },
21287
21329
  hoverBackground: channelHoverBackground || backgroundHovered
21288
21330
  }, showAvatar && (/*#__PURE__*/React__default.createElement(AvatarWrapper, null, /*#__PURE__*/React__default.createElement(Avatar, {
@@ -21308,7 +21350,23 @@ var Channel = function Channel(_ref3) {
21308
21350
  avatarSize: channelAvatarSize
21309
21351
  }, /*#__PURE__*/React__default.createElement("h3", null, channel.subject || (isDirectChannel && directChannelUser ? makeUsername(contactsMap && contactsMap[directChannelUser.id], directChannelUser, getFromContacts) : isSelfChannel ? 'Me' : '')), channel.muted && (/*#__PURE__*/React__default.createElement(MutedIcon, {
21310
21352
  color: notificationsIsMutedIconColor || iconInactive
21311
- }, notificationsIsMutedIcon || /*#__PURE__*/React__default.createElement(SvgUnmuteNotifications, null))), (lastMessage || typingOrRecording.items.length > 0 || draftMessageText) && (/*#__PURE__*/React__default.createElement(LastMessage, {
21353
+ }, notificationsIsMutedIcon || /*#__PURE__*/React__default.createElement(SvgUnmuteNotifications, null))), getCustomLatestMessage ? getCustomLatestMessageComponent({
21354
+ lastMessage: lastMessage,
21355
+ typingOrRecording: typingOrRecording,
21356
+ draftMessageText: draftMessageText,
21357
+ textSecondary: textSecondary,
21358
+ channel: channel,
21359
+ channelLastMessageFontSize: channelLastMessageFontSize || '14px',
21360
+ channelLastMessageHeight: channelLastMessageHeight || '20px',
21361
+ isDirectChannel: isDirectChannel,
21362
+ textPrimary: textPrimary,
21363
+ messageAuthorRef: messageAuthorRef,
21364
+ contactsMap: contactsMap || {},
21365
+ getFromContacts: getFromContacts,
21366
+ warningColor: warningColor,
21367
+ user: user,
21368
+ MessageText: MessageText
21369
+ }) : (lastMessage || typingOrRecording.items.length > 0 || draftMessageText) && (/*#__PURE__*/React__default.createElement(LastMessage, {
21312
21370
  color: textSecondary,
21313
21371
  markedAsUnread: !!(channel.unread || channel.newMessageCount && channel.newMessageCount > 0),
21314
21372
  unreadMentions: !!(channel.newMentionCount && channel.newMentionCount > 0),
@@ -21411,9 +21469,9 @@ var Container$2 = styled.div(_templateObject6$1 || (_templateObject6$1 = _tagged
21411
21469
  return props.channelsMargin || '0 8px';
21412
21470
  }, function (props) {
21413
21471
  return props.selectedChannelBorderRadius || '12px';
21414
- }, function (_ref4) {
21415
- var selectedChannel = _ref4.selectedChannel,
21416
- hoverBackground = _ref4.hoverBackground;
21472
+ }, function (_ref5) {
21473
+ var selectedChannel = _ref5.selectedChannel,
21474
+ hoverBackground = _ref5.hoverBackground;
21417
21475
  return !selectedChannel && "\n background-color: " + hoverBackground + ";\n ";
21418
21476
  }, UserStatus, function (props) {
21419
21477
  return props.selectedChannel ? props.selectedBackgroundColor : props.hoverBackground;
@@ -21428,9 +21486,9 @@ var DraftMessageText = styled.span(_templateObject8$1 || (_templateObject8$1 = _
21428
21486
  });
21429
21487
  var LastMessageAuthor = styled.div(_templateObject9$1 || (_templateObject9$1 = _taggedTemplateLiteralLoose(["\n max-width: 120px;\n font-weight: 500;\n color: ", ";\n\n ", "\n & > span {\n display: block;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n max-width: 100%;\n }\n"])), function (props) {
21430
21488
  return props.color;
21431
- }, function (_ref5) {
21432
- var typing = _ref5.typing,
21433
- recording = _ref5.recording;
21489
+ }, function (_ref6) {
21490
+ var typing = _ref6.typing,
21491
+ recording = _ref6.recording;
21434
21492
  return (typing || recording) && "\n font-weight: 500;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n max-width: calc(100% - " + (typing ? 62 : 76) + "px);\n ";
21435
21493
  });
21436
21494
  var Points = styled.span(_templateObject0$1 || (_templateObject0$1 = _taggedTemplateLiteralLoose(["\n margin-right: 4px;\n color: ", ";\n font-style: normal;\n"])), function (props) {
@@ -23348,7 +23406,8 @@ var ChannelList = function ChannelList(_ref) {
23348
23406
  channelAvatarTextSize = _ref.channelAvatarTextSize,
23349
23407
  searchChannelInputFontSize = _ref.searchChannelInputFontSize,
23350
23408
  searchedChannelsTitleFontSize = _ref.searchedChannelsTitleFontSize,
23351
- searchChannelsPadding = _ref.searchChannelsPadding;
23409
+ searchChannelsPadding = _ref.searchChannelsPadding,
23410
+ getCustomLatestMessage = _ref.getCustomLatestMessage;
23352
23411
  var _useColor = useColors(),
23353
23412
  background = _useColor[THEME_COLORS.BACKGROUND],
23354
23413
  textPrimary = _useColor[THEME_COLORS.TEXT_PRIMARY],
@@ -23416,11 +23475,6 @@ var ChannelList = function ChannelList(_ref) {
23416
23475
  handleLoadMoreChannels();
23417
23476
  }
23418
23477
  };
23419
- var handleChangeActiveChannel = function handleChangeActiveChannel(chan) {
23420
- if (activeChannel.id !== chan.id) {
23421
- dispatch(switchChannelActionAC(chan));
23422
- }
23423
- };
23424
23478
  var handleCrateChatWithContact = function handleCrateChatWithContact(contact) {
23425
23479
  if (contact) {
23426
23480
  var channelData = {
@@ -23576,6 +23630,13 @@ var ChannelList = function ChannelList(_ref) {
23576
23630
  setListWidthIsSet(false);
23577
23631
  }
23578
23632
  }, [channels]);
23633
+ var setSelectedChannel = function setSelectedChannel(channel) {
23634
+ if (activeChannel.id !== channel.id) {
23635
+ dispatch(sendTypingAC(false));
23636
+ dispatch(clearMessagesAC());
23637
+ dispatch(switchChannelActionAC(channel));
23638
+ }
23639
+ };
23579
23640
  return /*#__PURE__*/React__default.createElement(Container$7, {
23580
23641
  className: className,
23581
23642
  withCustomList: !!List,
@@ -23620,13 +23681,13 @@ var ChannelList = function ChannelList(_ref) {
23620
23681
  channels: channels,
23621
23682
  searchedChannels: searchedChannels,
23622
23683
  selectedChannel: activeChannel,
23623
- setSelectedChannel: handleChangeActiveChannel,
23684
+ setSelectedChannel: setSelectedChannel,
23624
23685
  loadMoreChannels: handleLoadMoreChannels,
23625
23686
  searchValue: searchValue
23626
23687
  }, !searchValue ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, channels.map(function (channel) {
23627
23688
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23628
23689
  channel: channel,
23629
- setSelectedChannel: handleChangeActiveChannel,
23690
+ setSelectedChannel: setSelectedChannel,
23630
23691
  key: channel.id
23631
23692
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23632
23693
  theme: theme,
@@ -23652,7 +23713,9 @@ var ChannelList = function ChannelList(_ref) {
23652
23713
  avatarBorderRadius: avatarBorderRadius,
23653
23714
  channel: channel,
23654
23715
  key: channel.id,
23655
- contactsMap: contactsMap
23716
+ contactsMap: contactsMap,
23717
+ setSelectedChannel: setSelectedChannel,
23718
+ getCustomLatestMessage: getCustomLatestMessage
23656
23719
  }));
23657
23720
  }))) : channelsLoading === LOADING_STATE.LOADED && searchValue ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$cha = searchedChannels.chats_groups) !== null && _searchedChannels$cha !== void 0 && _searchedChannels$cha.length || searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$cha2 = searchedChannels.channels) !== null && _searchedChannels$cha2 !== void 0 && _searchedChannels$cha2.length || searchedChannels !== null && searchedChannels !== void 0 && (_searchedChannels$con = searchedChannels.contacts) !== null && _searchedChannels$con !== void 0 && _searchedChannels$con.length ? (/*#__PURE__*/React__default.createElement(React__default.Fragment, null, !!(searchedChannels.chats_groups && searchedChannels.chats_groups.length) && (/*#__PURE__*/React__default.createElement(DirectChannels, null, /*#__PURE__*/React__default.createElement(SearchedChannelsHeader, {
23658
23721
  color: textSecondary,
@@ -23660,7 +23723,7 @@ var ChannelList = function ChannelList(_ref) {
23660
23723
  }, "Chats & Groups"), searchedChannels.chats_groups.map(function (channel) {
23661
23724
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23662
23725
  channel: channel,
23663
- setSelectedChannel: handleChangeActiveChannel,
23726
+ setSelectedChannel: setSelectedChannel,
23664
23727
  key: channel.id
23665
23728
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23666
23729
  theme: theme,
@@ -23686,7 +23749,9 @@ var ChannelList = function ChannelList(_ref) {
23686
23749
  avatarBorderRadius: avatarBorderRadius,
23687
23750
  channel: channel,
23688
23751
  key: channel.id,
23689
- contactsMap: contactsMap
23752
+ contactsMap: contactsMap,
23753
+ setSelectedChannel: setSelectedChannel,
23754
+ getCustomLatestMessage: getCustomLatestMessage
23690
23755
  }));
23691
23756
  }))), !!(searchedChannels.contacts && searchedChannels.contacts.length) && (/*#__PURE__*/React__default.createElement(GroupChannels, null, /*#__PURE__*/React__default.createElement(SearchedChannelsHeader, {
23692
23757
  color: textSecondary,
@@ -23695,7 +23760,7 @@ var ChannelList = function ChannelList(_ref) {
23695
23760
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23696
23761
  contact: contact,
23697
23762
  createChatWithContact: handleCrateChatWithContact,
23698
- setSelectedChannel: handleChangeActiveChannel,
23763
+ setSelectedChannel: setSelectedChannel,
23699
23764
  key: contact.id
23700
23765
  })) : (/*#__PURE__*/React__default.createElement(ContactItem, {
23701
23766
  theme: theme,
@@ -23726,7 +23791,7 @@ var ChannelList = function ChannelList(_ref) {
23726
23791
  }, "Channels"), searchedChannels.channels.map(function (channel) {
23727
23792
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23728
23793
  channel: channel,
23729
- setSelectedChannel: handleChangeActiveChannel,
23794
+ setSelectedChannel: setSelectedChannel,
23730
23795
  key: channel.id
23731
23796
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23732
23797
  theme: theme,
@@ -23752,7 +23817,9 @@ var ChannelList = function ChannelList(_ref) {
23752
23817
  avatarBorderRadius: avatarBorderRadius,
23753
23818
  channel: channel,
23754
23819
  key: channel.id,
23755
- contactsMap: contactsMap
23820
+ contactsMap: contactsMap,
23821
+ setSelectedChannel: setSelectedChannel,
23822
+ getCustomLatestMessage: getCustomLatestMessage
23756
23823
  }));
23757
23824
  }))))) : (/*#__PURE__*/React__default.createElement(NoData, {
23758
23825
  color: textSecondary,
@@ -23773,7 +23840,7 @@ var ChannelList = function ChannelList(_ref) {
23773
23840
  }, channels.map(function (channel) {
23774
23841
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23775
23842
  channel: channel,
23776
- setSelectedChannel: handleChangeActiveChannel,
23843
+ setSelectedChannel: setSelectedChannel,
23777
23844
  key: channel.id
23778
23845
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23779
23846
  theme: theme,
@@ -23799,7 +23866,9 @@ var ChannelList = function ChannelList(_ref) {
23799
23866
  avatarBorderRadius: avatarBorderRadius,
23800
23867
  channel: channel,
23801
23868
  key: channel.id,
23802
- contactsMap: contactsMap
23869
+ contactsMap: contactsMap,
23870
+ setSelectedChannel: setSelectedChannel,
23871
+ getCustomLatestMessage: getCustomLatestMessage
23803
23872
  }));
23804
23873
  }))), !!searchValue && (channelsLoading === LOADING_STATE.LOADED ? !((_searchedChannels$cha4 = searchedChannels.chats_groups) !== null && _searchedChannels$cha4 !== void 0 && _searchedChannels$cha4.length) && !((_searchedChannels$cha5 = searchedChannels.chats_groups) !== null && _searchedChannels$cha5 !== void 0 && _searchedChannels$cha5.length) && !((_searchedChannels$cha6 = searchedChannels.channels) !== null && _searchedChannels$cha6 !== void 0 && _searchedChannels$cha6.length) ? (/*#__PURE__*/React__default.createElement(NoData, {
23805
23874
  color: textSecondary,
@@ -23810,7 +23879,7 @@ var ChannelList = function ChannelList(_ref) {
23810
23879
  }, "Chats & Groups"), searchedChannels.chats_groups.map(function (channel) {
23811
23880
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23812
23881
  channel: channel,
23813
- setSelectedChannel: handleChangeActiveChannel,
23882
+ setSelectedChannel: setSelectedChannel,
23814
23883
  key: channel.id
23815
23884
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23816
23885
  theme: theme,
@@ -23836,7 +23905,9 @@ var ChannelList = function ChannelList(_ref) {
23836
23905
  avatarBorderRadius: avatarBorderRadius,
23837
23906
  channel: channel,
23838
23907
  contactsMap: contactsMap,
23839
- key: channel.id
23908
+ key: channel.id,
23909
+ setSelectedChannel: setSelectedChannel,
23910
+ getCustomLatestMessage: getCustomLatestMessage
23840
23911
  }));
23841
23912
  }))), !!searchedChannels.channels.length && (/*#__PURE__*/React__default.createElement(GroupChannels, null, /*#__PURE__*/React__default.createElement(SearchedChannelsHeader, {
23842
23913
  color: textSecondary,
@@ -23844,7 +23915,7 @@ var ChannelList = function ChannelList(_ref) {
23844
23915
  }, "Channels"), searchedChannels.channels.map(function (channel) {
23845
23916
  return ListItem ? (/*#__PURE__*/React__default.createElement(ListItem, {
23846
23917
  channel: channel,
23847
- setSelectedChannel: handleChangeActiveChannel,
23918
+ setSelectedChannel: setSelectedChannel,
23848
23919
  key: channel.id
23849
23920
  })) : (/*#__PURE__*/React__default.createElement(Channel, {
23850
23921
  theme: theme,
@@ -23870,7 +23941,9 @@ var ChannelList = function ChannelList(_ref) {
23870
23941
  avatarBorderRadius: avatarBorderRadius,
23871
23942
  channel: channel,
23872
23943
  key: channel.id,
23873
- contactsMap: contactsMap
23944
+ contactsMap: contactsMap,
23945
+ setSelectedChannel: setSelectedChannel,
23946
+ getCustomLatestMessage: getCustomLatestMessage
23874
23947
  }));
23875
23948
  }))))) : (/*#__PURE__*/React__default.createElement(LoadingWrapper, null, /*#__PURE__*/React__default.createElement(UploadingIcon, {
23876
23949
  color: textFootnote
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sceyt-chat-react-uikit",
3
- "version": "1.7.1-beta.10",
3
+ "version": "1.7.1-beta.12",
4
4
  "description": "Interactive React UI Components for Sceyt Chat.",
5
5
  "author": "Sceyt",
6
6
  "license": "MIT",