sceyt-chat-react-uikit 1.7.2-beta.6 → 1.7.2-beta.8

package/components/ChatContainer/index.d.ts

@@ -52,6 +52,7 @@ export interface IChatClientProps {
     openChatOnUserInteraction?: boolean;
     logLevel?: 'silent' | 'trace' | 'debug' | 'info' | 'warn' | 'error';
     memberCount?: number;
+    disableFrowardMentionsCount?: boolean;
 }
-declare const SceytChatContainer: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, defaultRolesByChannelTypesMap, channelTypeFilter, logoSrc, CustomUploader, showNotifications, hideUserPresence, openChatOnUserInteraction, autoSelectFirstChannel, logLevel, memberCount }: IChatClientProps) => React.JSX.Element;
+declare const SceytChatContainer: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, defaultRolesByChannelTypesMap, channelTypeFilter, logoSrc, CustomUploader, showNotifications, hideUserPresence, openChatOnUserInteraction, autoSelectFirstChannel, logLevel, memberCount, disableFrowardMentionsCount }: IChatClientProps) => React.JSX.Element;
 export default SceytChatContainer;

package/components/SceytChat/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { IChatClientProps } from '../ChatContainer';
-declare const SceytChat: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, logoSrc, CustomUploader, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, channelTypeFilter, defaultRolesByChannelTypesMap, hideUserPresence, showNotifications, openChatOnUserInteraction, autoSelectFirstChannel, memberCount }: IChatClientProps) => React.JSX.Element;
+declare const SceytChat: ({ client, theme, themeMode, avatarColors, children, showOnlyContactUsers, logoSrc, CustomUploader, handleNewMessages, sendAttachmentsAsSeparateMessages, membersDisplayTextByChannelTypesMap, channelTypeFilter, defaultRolesByChannelTypesMap, hideUserPresence, showNotifications, openChatOnUserInteraction, autoSelectFirstChannel, memberCount, disableFrowardMentionsCount }: IChatClientProps) => React.JSX.Element;
 export default SceytChat;
 export declare const Container: import("styled-components").StyledComponent<"div", any, {}, never>;

package/index.js

@@ -8968,6 +8968,7 @@ var UploadImageIcon;
 var showChannelDetails = false;
 var channelTypesFilter = [];
 var memberCount = 10;
+var disableFrowardMentionsCount = false;
 function setChannelInMap(channel) {
   channelsMap[channel.id] = _extends({}, channel);
 }
@@ -9064,6 +9065,12 @@ function getChannelMembersCount() {
 function setChannelMembersCount(count) {
   memberCount = count;
 }
+function setDisableFrowardMentionsCount(disable) {
+  disableFrowardMentionsCount = disable;
+}
+function getDisableFrowardMentionsCount() {
+  return disableFrowardMentionsCount;
+}
 var handleNewMessages;
 function setHandleNewMessages(callback) {
   handleNewMessages = callback;
@@ -14894,7 +14901,7 @@ function createChannel(action) {
         }
         messageToSend = {
           body: createdChannel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || createdChannel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? 'CC' : 'CG',
-          mentionedMembers: [],
+          mentionedUsers: [],
           attachments: [],
           type: 'system'
         };
@@ -17293,7 +17300,7 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
   try {
     var messageToAdd = JSON.parse(JSON.stringify(_extends({}, messageCopy, {
       createdAt: new Date(Date.now()),
-      mentionedUsers: message.mentionedMembers,
+      mentionedUsers: message.mentionedUsers,
       parentMessage: message.parentMessage
     })));
     addMessageToMap(channel.id, messageToAdd);
@@ -17351,7 +17358,7 @@ function sendMessage(action) {
         _context3.n = 7;
         return effects.put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 7:
-        mentionedUserIds = message.mentionedMembers ? message.mentionedMembers.map(function (member) {
+        mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         customUploader = getCustomUploader();
@@ -17732,7 +17739,7 @@ function sendTextMessage(action) {
         _context4.n = 7;
         return effects.put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 7:
-        mentionedUserIds = message.mentionedMembers ? message.mentionedMembers.map(function (member) {
+        mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         attachments = message.attachments;
@@ -17752,7 +17759,7 @@ function sendTextMessage(action) {
         messageToSend = messageBuilder.create();
         pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
           createdAt: new Date(Date.now()),
-          mentionedUsers: message.mentionedMembers,
+          mentionedUsers: message.mentionedUsers,
           parentMessage: message.parentMessage
         })));
         sendMessageTid = messageToSend.tid;
@@ -17838,16 +17845,14 @@ function sendTextMessage(action) {
       case 16:
         throw new Error('Connection required to send message');
       case 17:
+        store.dispatch(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
         _context4.n = 18;
-        return effects.put(scrollToNewMessageAC(true));
-      case 18:
-        _context4.n = 19;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        _context4.n = 22;
+      case 18:
+        _context4.n = 21;
         break;
-      case 20:
-        _context4.p = 20;
+      case 19:
+        _context4.p = 19;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -17857,23 +17862,23 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 21;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 21;
+        _context4.n = 20;
         return effects.put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 21:
-        _context4.n = 22;
+      case 20:
+        _context4.n = 21;
         return effects.put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 20]]);
+  }, _marked2$2, null, [[3, 19]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
@@ -17912,7 +17917,7 @@ function forwardMessage(action) {
         _context5.n = 6;
         return effects.put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 6:
-        mentionedUserIds = message.mentionedMembers ? message.mentionedMembers.map(function (member) {
+        mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         attachments = message.attachments;
@@ -17926,7 +17931,7 @@ function forwardMessage(action) {
           attachments = [att];
         }
         messageBuilder = channel.createMessageBuilder();
-        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setMetadata(message.metadata ? JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id);
+        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisableMentionsCount(getDisableFrowardMentionsCount()).setMetadata(message.metadata ? JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id);
         messageToSend = messageBuilder.create();
         pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
           createdAt: new Date(Date.now())
@@ -19616,7 +19621,7 @@ function addMembers(action) {
             m: membersIds
           },
           body: 'AM',
-          mentionedMembers: addedMembers,
+          mentionedUsers: addedMembers,
           attachments: [],
           type: 'system'
         };
@@ -19678,7 +19683,7 @@ function kickMemberFromChannel(action) {
             m: membersIds
           },
           body: 'RM',
-          mentionedMembers: removedMembers,
+          mentionedUsers: removedMembers,
           attachments: [],
           type: 'system'
         };
@@ -20478,7 +20483,9 @@ var SceytChat = function SceytChat(_ref) {
     openChatOnUserInteraction = _ref$openChatOnUserIn === void 0 ? true : _ref$openChatOnUserIn,
     _ref$autoSelectFirstC = _ref.autoSelectFirstChannel,
     autoSelectFirstChannel = _ref$autoSelectFirstC === void 0 ? false : _ref$autoSelectFirstC,
-    memberCount = _ref.memberCount;
+    memberCount = _ref.memberCount,
+    _ref$disableFrowardMe = _ref.disableFrowardMentionsCount,
+    disableFrowardMentionsCount = _ref$disableFrowardMe === void 0 ? false : _ref$disableFrowardMe;
   var _useColor = useColors(),
     backgroundColor = _useColor[THEME_COLORS.BACKGROUND],
     highlightedBackground = _useColor[THEME_COLORS.HIGHLIGHTED_BACKGROUND];
@@ -20683,6 +20690,9 @@ var SceytChat = function SceytChat(_ref) {
   React.useEffect(function () {
     setChannelMembersCount(memberCount || 0);
   }, [memberCount]);
+  React.useEffect(function () {
+    setDisableFrowardMentionsCount(disableFrowardMentionsCount);
+  }, [disableFrowardMentionsCount]);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, SceytChatClient ? (/*#__PURE__*/React__default.createElement(ChatContainer, {
     onDrop: handleDropFile,
     onDragOver: handleDragOver,
@@ -20729,7 +20739,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     autoSelectFirstChannel = _ref.autoSelectFirstChannel,
     _ref$logLevel = _ref.logLevel,
     logLevel = _ref$logLevel === void 0 ? 'silent' : _ref$logLevel,
-    memberCount = _ref.memberCount;
+    memberCount = _ref.memberCount,
+    disableFrowardMentionsCount = _ref.disableFrowardMentionsCount;
   React.useEffect(function () {
     log.setLevel(logLevel);
   }, []);
@@ -20754,7 +20765,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     openChatOnUserInteraction: openChatOnUserInteraction,
     autoSelectFirstChannel: autoSelectFirstChannel,
     channelTypeFilter: channelTypeFilter,
-    memberCount: memberCount
+    memberCount: memberCount,
+    disableFrowardMentionsCount: disableFrowardMentionsCount
   }));
 };
 
@@ -21376,7 +21388,7 @@ var Channel = function Channel(_ref3) {
         if (channelDraftMessage) {
           setDraftMessageText(channelDraftMessage.text);
           setDraftMessage({
-            mentionedUsers: channelDraftMessage.mentionedMembers,
+            mentionedUsers: channelDraftMessage.mentionedUsers,
             body: channelDraftMessage.text,
             bodyAttributes: channelDraftMessage.bodyAttributes
           });
@@ -26403,21 +26415,15 @@ function ReactionsPopup(_ref) {
   var _useState = React.useState('all'),
     activeTabKey = _useState[0],
     setActiveTabKey = _useState[1];
-  var _useState2 = React.useState(''),
-    popupVerticalPosition = _useState2[0],
-    setPopupVerticalPosition = _useState2[1];
-  var _useState3 = React.useState(0),
-    popupHeight = _useState3[0],
-    setPopupHeight = _useState3[1];
-  var _useState4 = React.useState(0),
-    scoresHeight = _useState4[0],
-    setScoresHeight = _useState4[1];
-  var _useState5 = React.useState(false),
-    calculateSizes = _useState5[0],
-    setCalculateSizes = _useState5[1];
-  var _useState6 = React.useState(false),
-    closeIsApproved = _useState6[0],
-    setCloseIsApproved = _useState6[1];
+  var _useState2 = React.useState(0),
+    popupHeight = _useState2[0],
+    setPopupHeight = _useState2[1];
+  var _useState3 = React.useState(false),
+    calculateSizes = _useState3[0],
+    setCalculateSizes = _useState3[1];
+  var _useState4 = React.useState(false),
+    closeIsApproved = _useState4[0],
+    setCloseIsApproved = _useState4[1];
   var totalReactions = 0;
   if (reactionTotals) {
     reactionTotals.forEach(function (summery) {
@@ -26426,9 +26432,9 @@ function ReactionsPopup(_ref) {
   }
   var user = getClient().user;
   var dispatch = useDispatch();
-  var _useState7 = React.useState(false),
-    isScrolling = _useState7[0],
-    setIsScrolling = _useState7[1];
+  var _useState5 = React.useState(false),
+    isScrolling = _useState5[0],
+    setIsScrolling = _useState5[1];
   var handleReactionsListScroll = function handleReactionsListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100 && reactionsHasNext) {
       if (reactionsLoadingState === LOADING_STATE.LOADED) {
@@ -26457,20 +26463,23 @@ function ReactionsPopup(_ref) {
       dispatch(setReactionsListAC([], true));
     };
   }, [messageId]);
-  React.useEffect(function () {
+  var scoresHeight = React.useMemo(function () {
     var scoresElem = scoresRef.current;
     if (scoresElem) {
-      setScoresHeight(scoresElem.offsetHeight);
+      return scoresElem.offsetHeight;
     }
-  });
+    return 0;
+  }, [scoresRef]);
   React.useEffect(function () {
     if (!reactionTotals || !reactionTotals.length) {
       handleReactionsPopupClose();
     }
   }, [reactionTotals]);
+  var reactionsHeight = React.useMemo(function () {
+    return reactions.length * 50 + 45;
+  }, [reactions]);
   React.useEffect(function () {
     if (reactions && reactionsPrevLength < reactions.length) {
-      var reactionsHeight = reactions.length * 44 + 45;
       if (reactionsHeight > popupHeight) {
         setPopupHeight(reactionsHeight);
       }
@@ -26480,14 +26489,15 @@ function ReactionsPopup(_ref) {
     }
     if (reactions && reactions.length) {
       if (calculateSizes) {
-        var botPost = bottomPosition - messageInputHeight - 40;
-        var _reactionsHeight = reactions.length * 50 + 45;
-        setPopupHeight(_reactionsHeight);
-        setPopupVerticalPosition(botPost >= (_reactionsHeight > 320 ? 320 : _reactionsHeight) ? 'bottom' : 'top');
+        setPopupHeight(reactionsHeight);
         setCalculateSizes(false);
       }
     }
-  }, [reactions]);
+  }, [reactions, reactionsHeight]);
+  var popupVerticalPosition = React.useMemo(function () {
+    var botPost = bottomPosition - messageInputHeight - 40;
+    return botPost >= (reactionsHeight > 320 ? 320 : reactionsHeight) ? 'bottom' : 'top';
+  }, [bottomPosition, messageInputHeight, reactionsHeight]);
   return /*#__PURE__*/React__default.createElement(Container$d, {
     ref: popupRef,
     popupVerticalPosition: popupVerticalPosition,
@@ -36879,8 +36889,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     messageBodyAttributes = _useState11[0],
     setMessageBodyAttributes = _useState11[1];
   var _useState12 = React.useState([]),
-    mentionedMembers = _useState12[0],
-    setMentionedMembers = _useState12[1];
+    mentionedUsers = _useState12[0],
+    setMentionedUsers = _useState12[1];
   var _useState13 = React.useState(''),
     browser = _useState13[0],
     setBrowser = _useState13[1];
@@ -37006,21 +37016,21 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         var messageToSend = {
           body: messageTexToSend,
           bodyAttributes: messageBodyAttributes,
-          mentionedMembers: [],
+          mentionedUsers: [],
           attachments: [],
           type: 'text'
         };
-        var mentionMembersToSend = [];
+        var mentionUsersToSend = [];
         if (messageBodyAttributes && messageBodyAttributes.length) {
           messageBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
-              mentionMembersToSend.push({
+              mentionUsersToSend.push({
                 id: att.metadata
               });
             }
           });
         }
-        messageToSend.mentionedMembers = mentionMembersToSend;
+        messageToSend.mentionedUsers = mentionUsersToSend;
         log.info('message to send ..........................................', JSON.stringify(messageToSend));
         if (messageForReply) {
           messageToSend.parentMessage = messageForReply;
@@ -37080,7 +37090,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setShouldClearEditor({
         clear: true
       });
-      setMentionedMembers([]);
+      setMentionedUsers([]);
       setMessageBodyAttributes([]);
       dispatch(setCloseSearchChannelsAC(true));
     } else {
@@ -37112,21 +37122,21 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           };
         }
       }
-      var mentionedMembersPositions = [];
-      var mentionMembersToSend = [];
-      if (mentionedMembers && mentionedMembers.length) {
+      var mentionedUsersPositions = [];
+      var mentionUsersToSend = [];
+      if (mentionedUsers && mentionedUsers.length) {
         if (messageBodyAttributes && messageBodyAttributes.length) {
           messageBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
-              var mentionsToFind = [].concat(mentionedMembers);
+              var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
               if (draftMessage) {
-                mentionsToFind = [].concat(draftMessage.mentionedMembers, mentionedMembers);
+                mentionsToFind = [].concat(draftMessage.mentionedUsers, mentionedUsers);
               }
               var mentionToAdd = mentionsToFind.find(function (mention) {
                 return mention.id === att.metadata;
               });
-              mentionMembersToSend.push(mentionToAdd);
+              mentionUsersToSend.push(mentionToAdd);
             }
           });
         }
@@ -37134,9 +37144,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var messageToSend = _extends({}, messageToEdit, linkAttachment ? {
         attachments: [linkAttachment]
       } : {}, {
-        metadata: mentionedMembersPositions,
+        metadata: mentionedUsersPositions,
         bodyAttributes: messageBodyAttributes,
-        mentionedUsers: mentionMembersToSend,
+        mentionedUsers: mentionUsersToSend,
         body: messageTexToSend
       });
       messageToSend.type = /(https?:\/\/[^\s]+)/.test(messageToSend.body) ? 'link' : messageToSend.type;
@@ -37146,7 +37156,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCloseEditMode = function handleCloseEditMode() {
     setEditMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
     dispatch(setMessageToEditAC(null));
   };
   var removeUpload = function removeUpload(attachmentId) {
@@ -37245,7 +37255,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCut = function handleCut() {
     setMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
   };
   var handleEmojiPopupToggle = function handleEmojiPopupToggle(bool) {
     setIsEmojisOpened(bool);
@@ -37313,7 +37323,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     dispatch(clearSelectedMessagesAC());
   };
   var handleSetMentionMember = function handleSetMentionMember(mentionMember) {
-    setMentionedMembers(function (prevState) {
+    setMentionedUsers(function (prevState) {
       return [].concat(prevState, [mentionMember]);
     });
   };
@@ -37694,7 +37704,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
             var messageToSend = {
               metadata: '',
               body: '',
-              mentionedMembers: [],
+              mentionedUsers: [],
               attachments: [{
                 name: uuid.v4() + ".mp3",
                 data: recordedFile.file,
@@ -37749,7 +37759,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           dispatch(setMessageForReplyAC(draftMessage.messageForReply));
         }
         setMessageText(draftMessage.text);
-        setMentionedMembers(draftMessage.mentionedMembers);
+        setMentionedUsers(draftMessage.mentionedUsers);
       }
       setShouldClearEditor({
         clear: true,
@@ -37760,7 +37770,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       prevActiveChannelId = activeChannel.id;
     }
     dispatch(getMembersAC(activeChannel.id));
-    setMentionedMembers([]);
+    setMentionedUsers([]);
   }, [activeChannel.id]);
   React.useEffect(function () {
     if (messageText.trim() || editMessageText.trim() && editMessageText && editMessageText.trim() !== messageToEdit.body || attachments.length) {
@@ -37795,10 +37805,10 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
     if (messageText.trim()) {
       var draftMessage = getDraftMessageFromMap(activeChannel.id);
-      if (draftMessage && draftMessage.mentionedMembers && draftMessage.mentionedMembers.length) {
+      if (draftMessage && draftMessage.mentionedUsers && draftMessage.mentionedUsers.length) {
         setDraftMessageToMap(activeChannel.id, {
           text: messageText,
-          mentionedMembers: draftMessage.mentionedMembers,
+          mentionedUsers: draftMessage.mentionedUsers,
           messageForReply: messageForReply,
           editorState: realEditorState,
           bodyAttributes: messageBodyAttributes
@@ -37806,7 +37816,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       } else {
         setDraftMessageToMap(activeChannel.id, {
           text: messageText,
-          mentionedMembers: mentionedMembers,
+          mentionedUsers: mentionedUsers,
           messageForReply: messageForReply,
           editorState: realEditorState,
           bodyAttributes: messageBodyAttributes
@@ -37826,15 +37836,15 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
   }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes]);
   useDidUpdate(function () {
-    if (mentionedMembers && mentionedMembers.length) {
+    if (mentionedUsers && mentionedUsers.length) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
-        mentionedMembers: mentionedMembers,
+        mentionedUsers: mentionedUsers,
         messageForReply: messageForReply,
         bodyAttributes: messageBodyAttributes
       });
     }
-  }, [mentionedMembers]);
+  }, [mentionedUsers]);
   React.useEffect(function () {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       var pendingMessagesMap = getPendingMessagesMap();
@@ -37885,7 +37895,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (draftMessagesMap[activeChannel.id]) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
-        mentionedMembers: mentionedMembers,
+        mentionedUsers: mentionedUsers,
         messageForReply: messageForReply,
         bodyAttributes: messageBodyAttributes
       });
@@ -38200,7 +38210,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     editMessage: messageToEdit,
     contactsMap: contactsMap,
     getFromContacts: getFromContacts,
-    setMentionedMember: setMentionedMembers
+    setMentionedMember: setMentionedUsers
   }), /*#__PURE__*/React__default.createElement(FormatMessagePlugin, {
     editorState: realEditorState,
     setMessageBodyAttributes: setMessageBodyAttributes,

package/index.modern.js

@@ -8947,6 +8947,7 @@ var UploadImageIcon;
 var showChannelDetails = false;
 var channelTypesFilter = [];
 var memberCount = 10;
+var disableFrowardMentionsCount = false;
 function setChannelInMap(channel) {
   channelsMap[channel.id] = _extends({}, channel);
 }
@@ -9043,6 +9044,12 @@ function getChannelMembersCount() {
 function setChannelMembersCount(count) {
   memberCount = count;
 }
+function setDisableFrowardMentionsCount(disable) {
+  disableFrowardMentionsCount = disable;
+}
+function getDisableFrowardMentionsCount() {
+  return disableFrowardMentionsCount;
+}
 var handleNewMessages;
 function setHandleNewMessages(callback) {
   handleNewMessages = callback;
@@ -14873,7 +14880,7 @@ function createChannel(action) {
         }
         messageToSend = {
           body: createdChannel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || createdChannel.type === DEFAULT_CHANNEL_TYPE.PUBLIC ? 'CC' : 'CG',
-          mentionedMembers: [],
+          mentionedUsers: [],
           attachments: [],
           type: 'system'
         };
@@ -17272,7 +17279,7 @@ var addPendingMessage = function addPendingMessage(message, messageCopy, channel
   try {
     var messageToAdd = JSON.parse(JSON.stringify(_extends({}, messageCopy, {
       createdAt: new Date(Date.now()),
-      mentionedUsers: message.mentionedMembers,
+      mentionedUsers: message.mentionedUsers,
       parentMessage: message.parentMessage
     })));
     addMessageToMap(channel.id, messageToAdd);
@@ -17330,7 +17337,7 @@ function sendMessage(action) {
         _context3.n = 7;
         return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 7:
-        mentionedUserIds = message.mentionedMembers ? message.mentionedMembers.map(function (member) {
+        mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         customUploader = getCustomUploader();
@@ -17711,7 +17718,7 @@ function sendTextMessage(action) {
         _context4.n = 7;
         return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 7:
-        mentionedUserIds = message.mentionedMembers ? message.mentionedMembers.map(function (member) {
+        mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         attachments = message.attachments;
@@ -17731,7 +17738,7 @@ function sendTextMessage(action) {
         messageToSend = messageBuilder.create();
         pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
           createdAt: new Date(Date.now()),
-          mentionedUsers: message.mentionedMembers,
+          mentionedUsers: message.mentionedUsers,
           parentMessage: message.parentMessage
         })));
         sendMessageTid = messageToSend.tid;
@@ -17817,16 +17824,14 @@ function sendTextMessage(action) {
       case 16:
         throw new Error('Connection required to send message');
       case 17:
+        store.dispatch(getMessagesAC(channel, true, channel.lastMessage.id, undefined, undefined, false));
         _context4.n = 18;
-        return put(scrollToNewMessageAC(true));
-      case 18:
-        _context4.n = 19;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 19:
-        _context4.n = 22;
+      case 18:
+        _context4.n = 21;
         break;
-      case 20:
-        _context4.p = 20;
+      case 19:
+        _context4.p = 19;
         _t3 = _context4.v;
         log.error('error on send text message ... ', _t3);
         updateMessageOnMap(channel.id, {
@@ -17836,23 +17841,23 @@ function sendTextMessage(action) {
           }
         });
         if (!(activeChannelId === channel.id)) {
-          _context4.n = 21;
+          _context4.n = 20;
           break;
         }
         updateMessageOnAllMessages(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         });
-        _context4.n = 21;
+        _context4.n = 20;
         return put(updateMessageAC(sendMessageTid, {
           state: MESSAGE_STATUS.FAILED
         }));
-      case 21:
-        _context4.n = 22;
+      case 20:
+        _context4.n = 21;
         return put(setMessagesLoadingStateAC(LOADING_STATE.LOADED));
-      case 22:
+      case 21:
         return _context4.a(2);
     }
-  }, _marked2$2, null, [[3, 20]]);
+  }, _marked2$2, null, [[3, 19]]);
 }
 function forwardMessage(action) {
   var payload, message, channelId, connectionState, channel, SceytChatClient, mentionedUserIds, attachments, attachmentBuilder, att, messageBuilder, messageToSend, pendingMessage, activeChannelId, isCachedChannel, hasNextMessages, messageResponse, messageUpdateData, messageToUpdate, channelUpdateParam, _t4;
@@ -17891,7 +17896,7 @@ function forwardMessage(action) {
         _context5.n = 6;
         return put(addChannelAC(JSON.parse(JSON.stringify(channel))));
       case 6:
-        mentionedUserIds = message.mentionedMembers ? message.mentionedMembers.map(function (member) {
+        mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         attachments = message.attachments;
@@ -17905,7 +17910,7 @@ function forwardMessage(action) {
           attachments = [att];
         }
         messageBuilder = channel.createMessageBuilder();
-        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setMetadata(message.metadata ? JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id);
+        messageBuilder.setBody(message.body).setBodyAttributes(message.bodyAttributes).setAttachments(attachments).setMentionUserIds(mentionedUserIds).setType(message.type).setDisableMentionsCount(getDisableFrowardMentionsCount()).setMetadata(message.metadata ? JSON.stringify(message.metadata) : '').setForwardingMessageId(message.forwardingDetails ? message.forwardingDetails.messageId : message.id);
         messageToSend = messageBuilder.create();
         pendingMessage = JSON.parse(JSON.stringify(_extends({}, messageToSend, {
           createdAt: new Date(Date.now())
@@ -19595,7 +19600,7 @@ function addMembers(action) {
             m: membersIds
           },
           body: 'AM',
-          mentionedMembers: addedMembers,
+          mentionedUsers: addedMembers,
           attachments: [],
           type: 'system'
         };
@@ -19657,7 +19662,7 @@ function kickMemberFromChannel(action) {
             m: membersIds
           },
           body: 'RM',
-          mentionedMembers: removedMembers,
+          mentionedUsers: removedMembers,
           attachments: [],
           type: 'system'
         };
@@ -20457,7 +20462,9 @@ var SceytChat = function SceytChat(_ref) {
     openChatOnUserInteraction = _ref$openChatOnUserIn === void 0 ? true : _ref$openChatOnUserIn,
     _ref$autoSelectFirstC = _ref.autoSelectFirstChannel,
     autoSelectFirstChannel = _ref$autoSelectFirstC === void 0 ? false : _ref$autoSelectFirstC,
-    memberCount = _ref.memberCount;
+    memberCount = _ref.memberCount,
+    _ref$disableFrowardMe = _ref.disableFrowardMentionsCount,
+    disableFrowardMentionsCount = _ref$disableFrowardMe === void 0 ? false : _ref$disableFrowardMe;
   var _useColor = useColors(),
     backgroundColor = _useColor[THEME_COLORS.BACKGROUND],
     highlightedBackground = _useColor[THEME_COLORS.HIGHLIGHTED_BACKGROUND];
@@ -20662,6 +20669,9 @@ var SceytChat = function SceytChat(_ref) {
   useEffect(function () {
     setChannelMembersCount(memberCount || 0);
   }, [memberCount]);
+  useEffect(function () {
+    setDisableFrowardMentionsCount(disableFrowardMentionsCount);
+  }, [disableFrowardMentionsCount]);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, SceytChatClient ? (/*#__PURE__*/React__default.createElement(ChatContainer, {
     onDrop: handleDropFile,
     onDragOver: handleDragOver,
@@ -20708,7 +20718,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     autoSelectFirstChannel = _ref.autoSelectFirstChannel,
     _ref$logLevel = _ref.logLevel,
     logLevel = _ref$logLevel === void 0 ? 'silent' : _ref$logLevel,
-    memberCount = _ref.memberCount;
+    memberCount = _ref.memberCount,
+    disableFrowardMentionsCount = _ref.disableFrowardMentionsCount;
   useEffect(function () {
     log.setLevel(logLevel);
   }, []);
@@ -20733,7 +20744,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     openChatOnUserInteraction: openChatOnUserInteraction,
     autoSelectFirstChannel: autoSelectFirstChannel,
     channelTypeFilter: channelTypeFilter,
-    memberCount: memberCount
+    memberCount: memberCount,
+    disableFrowardMentionsCount: disableFrowardMentionsCount
   }));
 };
 
@@ -21355,7 +21367,7 @@ var Channel = function Channel(_ref3) {
         if (channelDraftMessage) {
           setDraftMessageText(channelDraftMessage.text);
           setDraftMessage({
-            mentionedUsers: channelDraftMessage.mentionedMembers,
+            mentionedUsers: channelDraftMessage.mentionedUsers,
             body: channelDraftMessage.text,
             bodyAttributes: channelDraftMessage.bodyAttributes
           });
@@ -26382,21 +26394,15 @@ function ReactionsPopup(_ref) {
   var _useState = useState('all'),
     activeTabKey = _useState[0],
     setActiveTabKey = _useState[1];
-  var _useState2 = useState(''),
-    popupVerticalPosition = _useState2[0],
-    setPopupVerticalPosition = _useState2[1];
-  var _useState3 = useState(0),
-    popupHeight = _useState3[0],
-    setPopupHeight = _useState3[1];
-  var _useState4 = useState(0),
-    scoresHeight = _useState4[0],
-    setScoresHeight = _useState4[1];
-  var _useState5 = useState(false),
-    calculateSizes = _useState5[0],
-    setCalculateSizes = _useState5[1];
-  var _useState6 = useState(false),
-    closeIsApproved = _useState6[0],
-    setCloseIsApproved = _useState6[1];
+  var _useState2 = useState(0),
+    popupHeight = _useState2[0],
+    setPopupHeight = _useState2[1];
+  var _useState3 = useState(false),
+    calculateSizes = _useState3[0],
+    setCalculateSizes = _useState3[1];
+  var _useState4 = useState(false),
+    closeIsApproved = _useState4[0],
+    setCloseIsApproved = _useState4[1];
   var totalReactions = 0;
   if (reactionTotals) {
     reactionTotals.forEach(function (summery) {
@@ -26405,9 +26411,9 @@ function ReactionsPopup(_ref) {
   }
   var user = getClient().user;
   var dispatch = useDispatch();
-  var _useState7 = useState(false),
-    isScrolling = _useState7[0],
-    setIsScrolling = _useState7[1];
+  var _useState5 = useState(false),
+    isScrolling = _useState5[0],
+    setIsScrolling = _useState5[1];
   var handleReactionsListScroll = function handleReactionsListScroll(event) {
     if (event.target.scrollTop >= event.target.scrollHeight - event.target.offsetHeight - 100 && reactionsHasNext) {
       if (reactionsLoadingState === LOADING_STATE.LOADED) {
@@ -26436,20 +26442,23 @@ function ReactionsPopup(_ref) {
       dispatch(setReactionsListAC([], true));
     };
   }, [messageId]);
-  useEffect(function () {
+  var scoresHeight = useMemo(function () {
     var scoresElem = scoresRef.current;
     if (scoresElem) {
-      setScoresHeight(scoresElem.offsetHeight);
+      return scoresElem.offsetHeight;
     }
-  });
+    return 0;
+  }, [scoresRef]);
   useEffect(function () {
     if (!reactionTotals || !reactionTotals.length) {
       handleReactionsPopupClose();
     }
   }, [reactionTotals]);
+  var reactionsHeight = useMemo(function () {
+    return reactions.length * 50 + 45;
+  }, [reactions]);
   useEffect(function () {
     if (reactions && reactionsPrevLength < reactions.length) {
-      var reactionsHeight = reactions.length * 44 + 45;
       if (reactionsHeight > popupHeight) {
         setPopupHeight(reactionsHeight);
       }
@@ -26459,14 +26468,15 @@ function ReactionsPopup(_ref) {
     }
     if (reactions && reactions.length) {
       if (calculateSizes) {
-        var botPost = bottomPosition - messageInputHeight - 40;
-        var _reactionsHeight = reactions.length * 50 + 45;
-        setPopupHeight(_reactionsHeight);
-        setPopupVerticalPosition(botPost >= (_reactionsHeight > 320 ? 320 : _reactionsHeight) ? 'bottom' : 'top');
+        setPopupHeight(reactionsHeight);
         setCalculateSizes(false);
       }
     }
-  }, [reactions]);
+  }, [reactions, reactionsHeight]);
+  var popupVerticalPosition = useMemo(function () {
+    var botPost = bottomPosition - messageInputHeight - 40;
+    return botPost >= (reactionsHeight > 320 ? 320 : reactionsHeight) ? 'bottom' : 'top';
+  }, [bottomPosition, messageInputHeight, reactionsHeight]);
   return /*#__PURE__*/React__default.createElement(Container$d, {
     ref: popupRef,
     popupVerticalPosition: popupVerticalPosition,
@@ -36858,8 +36868,8 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     messageBodyAttributes = _useState11[0],
     setMessageBodyAttributes = _useState11[1];
   var _useState12 = useState([]),
-    mentionedMembers = _useState12[0],
-    setMentionedMembers = _useState12[1];
+    mentionedUsers = _useState12[0],
+    setMentionedUsers = _useState12[1];
   var _useState13 = useState(''),
     browser = _useState13[0],
     setBrowser = _useState13[1];
@@ -36985,21 +36995,21 @@ var SendMessageInput = function SendMessageInput(_ref3) {
         var messageToSend = {
           body: messageTexToSend,
           bodyAttributes: messageBodyAttributes,
-          mentionedMembers: [],
+          mentionedUsers: [],
           attachments: [],
           type: 'text'
         };
-        var mentionMembersToSend = [];
+        var mentionUsersToSend = [];
         if (messageBodyAttributes && messageBodyAttributes.length) {
           messageBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
-              mentionMembersToSend.push({
+              mentionUsersToSend.push({
                 id: att.metadata
               });
             }
           });
         }
-        messageToSend.mentionedMembers = mentionMembersToSend;
+        messageToSend.mentionedUsers = mentionUsersToSend;
         log.info('message to send ..........................................', JSON.stringify(messageToSend));
         if (messageForReply) {
           messageToSend.parentMessage = messageForReply;
@@ -37059,7 +37069,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setShouldClearEditor({
         clear: true
       });
-      setMentionedMembers([]);
+      setMentionedUsers([]);
       setMessageBodyAttributes([]);
       dispatch(setCloseSearchChannelsAC(true));
     } else {
@@ -37091,21 +37101,21 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           };
         }
       }
-      var mentionedMembersPositions = [];
-      var mentionMembersToSend = [];
-      if (mentionedMembers && mentionedMembers.length) {
+      var mentionedUsersPositions = [];
+      var mentionUsersToSend = [];
+      if (mentionedUsers && mentionedUsers.length) {
         if (messageBodyAttributes && messageBodyAttributes.length) {
           messageBodyAttributes.forEach(function (att) {
             if (att.type === 'mention') {
-              var mentionsToFind = [].concat(mentionedMembers);
+              var mentionsToFind = [].concat(mentionedUsers);
               var draftMessage = getDraftMessageFromMap(activeChannel.id);
               if (draftMessage) {
-                mentionsToFind = [].concat(draftMessage.mentionedMembers, mentionedMembers);
+                mentionsToFind = [].concat(draftMessage.mentionedUsers, mentionedUsers);
               }
               var mentionToAdd = mentionsToFind.find(function (mention) {
                 return mention.id === att.metadata;
               });
-              mentionMembersToSend.push(mentionToAdd);
+              mentionUsersToSend.push(mentionToAdd);
             }
           });
         }
@@ -37113,9 +37123,9 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       var messageToSend = _extends({}, messageToEdit, linkAttachment ? {
         attachments: [linkAttachment]
       } : {}, {
-        metadata: mentionedMembersPositions,
+        metadata: mentionedUsersPositions,
         bodyAttributes: messageBodyAttributes,
-        mentionedUsers: mentionMembersToSend,
+        mentionedUsers: mentionUsersToSend,
         body: messageTexToSend
       });
       messageToSend.type = /(https?:\/\/[^\s]+)/.test(messageToSend.body) ? 'link' : messageToSend.type;
@@ -37125,7 +37135,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCloseEditMode = function handleCloseEditMode() {
     setEditMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
     dispatch(setMessageToEditAC(null));
   };
   var removeUpload = function removeUpload(attachmentId) {
@@ -37224,7 +37234,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCut = function handleCut() {
     setMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
   };
   var handleEmojiPopupToggle = function handleEmojiPopupToggle(bool) {
     setIsEmojisOpened(bool);
@@ -37292,7 +37302,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     dispatch(clearSelectedMessagesAC());
   };
   var handleSetMentionMember = function handleSetMentionMember(mentionMember) {
-    setMentionedMembers(function (prevState) {
+    setMentionedUsers(function (prevState) {
       return [].concat(prevState, [mentionMember]);
     });
   };
@@ -37673,7 +37683,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
             var messageToSend = {
               metadata: '',
               body: '',
-              mentionedMembers: [],
+              mentionedUsers: [],
               attachments: [{
                 name: v4() + ".mp3",
                 data: recordedFile.file,
@@ -37728,7 +37738,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           dispatch(setMessageForReplyAC(draftMessage.messageForReply));
         }
         setMessageText(draftMessage.text);
-        setMentionedMembers(draftMessage.mentionedMembers);
+        setMentionedUsers(draftMessage.mentionedUsers);
       }
       setShouldClearEditor({
         clear: true,
@@ -37739,7 +37749,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       prevActiveChannelId = activeChannel.id;
     }
     dispatch(getMembersAC(activeChannel.id));
-    setMentionedMembers([]);
+    setMentionedUsers([]);
   }, [activeChannel.id]);
   useEffect(function () {
     if (messageText.trim() || editMessageText.trim() && editMessageText && editMessageText.trim() !== messageToEdit.body || attachments.length) {
@@ -37774,10 +37784,10 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
     if (messageText.trim()) {
       var draftMessage = getDraftMessageFromMap(activeChannel.id);
-      if (draftMessage && draftMessage.mentionedMembers && draftMessage.mentionedMembers.length) {
+      if (draftMessage && draftMessage.mentionedUsers && draftMessage.mentionedUsers.length) {
         setDraftMessageToMap(activeChannel.id, {
           text: messageText,
-          mentionedMembers: draftMessage.mentionedMembers,
+          mentionedUsers: draftMessage.mentionedUsers,
           messageForReply: messageForReply,
           editorState: realEditorState,
           bodyAttributes: messageBodyAttributes
@@ -37785,7 +37795,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       } else {
         setDraftMessageToMap(activeChannel.id, {
           text: messageText,
-          mentionedMembers: mentionedMembers,
+          mentionedUsers: mentionedUsers,
           messageForReply: messageForReply,
           editorState: realEditorState,
           bodyAttributes: messageBodyAttributes
@@ -37805,15 +37815,15 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     }
   }, [messageText, attachments, editMessageText, readyVideoAttachments, messageBodyAttributes]);
   useDidUpdate(function () {
-    if (mentionedMembers && mentionedMembers.length) {
+    if (mentionedUsers && mentionedUsers.length) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
-        mentionedMembers: mentionedMembers,
+        mentionedUsers: mentionedUsers,
         messageForReply: messageForReply,
         bodyAttributes: messageBodyAttributes
       });
     }
-  }, [mentionedMembers]);
+  }, [mentionedUsers]);
   useEffect(function () {
     if (connectionStatus === CONNECTION_STATUS.CONNECTED) {
       var pendingMessagesMap = getPendingMessagesMap();
@@ -37864,7 +37874,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (draftMessagesMap[activeChannel.id]) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
-        mentionedMembers: mentionedMembers,
+        mentionedUsers: mentionedUsers,
         messageForReply: messageForReply,
         bodyAttributes: messageBodyAttributes
       });
@@ -38179,7 +38189,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     editMessage: messageToEdit,
     contactsMap: contactsMap,
     getFromContacts: getFromContacts,
-    setMentionedMember: setMentionedMembers
+    setMentionedMember: setMentionedUsers
   }), /*#__PURE__*/React__default.createElement(FormatMessagePlugin, {
     editorState: realEditorState,
     setMessageBodyAttributes: setMessageBodyAttributes,

package/package.json

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