sceyt-chat-react-uikit 1.7.2-beta.5 → 1.7.2-beta.7

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;
@@ -17912,7 +17919,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 +17933,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 +19623,7 @@ function addMembers(action) {
             m: membersIds
           },
           body: 'AM',
-          mentionedMembers: addedMembers,
+          mentionedUsers: addedMembers,
           attachments: [],
           type: 'system'
         };
@@ -19678,7 +19685,7 @@ function kickMemberFromChannel(action) {
             m: membersIds
           },
           body: 'RM',
-          mentionedMembers: removedMembers,
+          mentionedUsers: removedMembers,
           attachments: [],
           type: 'system'
         };
@@ -20478,7 +20485,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 +20692,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 +20741,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 +20767,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     openChatOnUserInteraction: openChatOnUserInteraction,
     autoSelectFirstChannel: autoSelectFirstChannel,
     channelTypeFilter: channelTypeFilter,
-    memberCount: memberCount
+    memberCount: memberCount,
+    disableFrowardMentionsCount: disableFrowardMentionsCount
   }));
 };
 
@@ -21376,7 +21390,7 @@ var Channel = function Channel(_ref3) {
         if (channelDraftMessage) {
           setDraftMessageText(channelDraftMessage.text);
           setDraftMessage({
-            mentionedUsers: channelDraftMessage.mentionedMembers,
+            mentionedUsers: channelDraftMessage.mentionedUsers,
             body: channelDraftMessage.text,
             bodyAttributes: channelDraftMessage.bodyAttributes
           });
@@ -32814,7 +32828,7 @@ var Message$1 = function Message(_ref) {
     handleAddDeleteEmoji: handleReactionAddDelete,
     reactionsDetailsPopupBorderRadius: reactionsDetailsPopupBorderRadius,
     reactionsDetailsPopupHeaderItemsStyle: reactionsDetailsPopupHeaderItemsStyle
-  })), message.reactionTotals && message.reactionTotals.length && (/*#__PURE__*/React__default.createElement(ReactionsContainer, {
+  })), /*#__PURE__*/React__default.createElement(ReactionsContainer, {
     id: message.id + "_reactions_container",
     border: reactionsContainerBorder,
     boxShadow: reactionsContainerBoxShadow,
@@ -32822,8 +32836,9 @@ var Message$1 = function Message(_ref) {
     topPosition: reactionsContainerTopPosition,
     padding: reactionsContainerPadding,
     backgroundColor: reactionsContainerBackground || backgroundSections,
-    rtlDirection: ownMessageOnRightSide && !message.incoming
-  }, /*#__PURE__*/React__default.createElement(MessageReactionsCont, {
+    rtlDirection: ownMessageOnRightSide && !message.incoming,
+    isReacted: message.reactionTotals && message.reactionTotals.length > 0
+  }, message.reactionTotals && message.reactionTotals.length && (/*#__PURE__*/React__default.createElement(MessageReactionsCont, {
     rtlDirection: ownMessageOnRightSide && !message.incoming,
     onClick: handleToggleReactionsPopup
   }, message.reactionTotals.slice(0, reactionsDisplayCount || 5).map(function (summery) {
@@ -32914,7 +32929,7 @@ var EmptySelection = styled__default.span(_templateObject8$d || (_templateObject
 }, function (props) {
   return props.disabled && '0.5';
 });
-var ReactionsContainer = styled__default.div(_templateObject9$b || (_templateObject9$b = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  margin-left: ", ";\n  margin-right: ", ";\n\n  margin-top: 4px;\n  justify-content: flex-end;\n  border: ", ";\n  box-shadow: ", ";\n  filter: drop-shadow(0px 0px 2px rgba(17, 21, 57, 0.08));\n  border-radius: ", ";\n  background-color: ", ";\n  padding: ", ";\n  z-index: 9;\n  ", ";\n"])), function (props) {
+var ReactionsContainer = styled__default.div(_templateObject9$b || (_templateObject9$b = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  margin-left: ", ";\n  margin-right: ", ";\n\n  margin-top: 4px;\n  justify-content: flex-end;\n  border: ", ";\n  box-shadow: ", ";\n  filter: drop-shadow(0px 0px 2px rgba(17, 21, 57, 0.08));\n  border-radius: ", ";\n  background-color: ", ";\n  padding: ", ";\n  z-index: 9;\n  ", ";\n  overflow: hidden;\n  height: ", ";\n  transition: all 0.3s;\n"])), function (props) {
   return props.rtlDirection && 'auto';
 }, function (props) {
   return !props.rtlDirection && 'auto';
@@ -32927,9 +32942,11 @@ var ReactionsContainer = styled__default.div(_templateObject9$b || (_templateObj
 }, function (props) {
   return props.backgroundColor;
 }, function (props) {
-  return props.padding || '4px 8px';
+  return !props.isReacted ? '0' : props.padding || '4px 8px';
 }, function (props) {
   return props.topPosition && "\n      position: relative;\n      top: " + props.topPosition + ";\n  ";
+}, function (props) {
+  return props.isReacted ? '16px' : '0';
 });
 var MessageReactionsCont = styled__default.div(_templateObject0$a || (_templateObject0$a = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: inline-flex;\n  max-width: 300px;\n  direction: ", ";\n  cursor: pointer;\n"])), function (props) {
   return props.rtlDirection && 'ltr';
@@ -36876,8 +36893,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];
@@ -37003,21 +37020,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;
@@ -37077,7 +37094,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setShouldClearEditor({
         clear: true
       });
-      setMentionedMembers([]);
+      setMentionedUsers([]);
       setMessageBodyAttributes([]);
       dispatch(setCloseSearchChannelsAC(true));
     } else {
@@ -37109,21 +37126,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);
             }
           });
         }
@@ -37131,9 +37148,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;
@@ -37143,7 +37160,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCloseEditMode = function handleCloseEditMode() {
     setEditMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
     dispatch(setMessageToEditAC(null));
   };
   var removeUpload = function removeUpload(attachmentId) {
@@ -37242,7 +37259,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCut = function handleCut() {
     setMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
   };
   var handleEmojiPopupToggle = function handleEmojiPopupToggle(bool) {
     setIsEmojisOpened(bool);
@@ -37310,7 +37327,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     dispatch(clearSelectedMessagesAC());
   };
   var handleSetMentionMember = function handleSetMentionMember(mentionMember) {
-    setMentionedMembers(function (prevState) {
+    setMentionedUsers(function (prevState) {
       return [].concat(prevState, [mentionMember]);
     });
   };
@@ -37691,7 +37708,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
             var messageToSend = {
               metadata: '',
               body: '',
-              mentionedMembers: [],
+              mentionedUsers: [],
               attachments: [{
                 name: uuid.v4() + ".mp3",
                 data: recordedFile.file,
@@ -37746,7 +37763,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           dispatch(setMessageForReplyAC(draftMessage.messageForReply));
         }
         setMessageText(draftMessage.text);
-        setMentionedMembers(draftMessage.mentionedMembers);
+        setMentionedUsers(draftMessage.mentionedUsers);
       }
       setShouldClearEditor({
         clear: true,
@@ -37757,7 +37774,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) {
@@ -37792,10 +37809,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
@@ -37803,7 +37820,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       } else {
         setDraftMessageToMap(activeChannel.id, {
           text: messageText,
-          mentionedMembers: mentionedMembers,
+          mentionedUsers: mentionedUsers,
           messageForReply: messageForReply,
           editorState: realEditorState,
           bodyAttributes: messageBodyAttributes
@@ -37823,15 +37840,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();
@@ -37882,7 +37899,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (draftMessagesMap[activeChannel.id]) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
-        mentionedMembers: mentionedMembers,
+        mentionedUsers: mentionedUsers,
         messageForReply: messageForReply,
         bodyAttributes: messageBodyAttributes
       });
@@ -38197,7 +38214,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;
@@ -17891,7 +17898,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 +17912,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 +19602,7 @@ function addMembers(action) {
             m: membersIds
           },
           body: 'AM',
-          mentionedMembers: addedMembers,
+          mentionedUsers: addedMembers,
           attachments: [],
           type: 'system'
         };
@@ -19657,7 +19664,7 @@ function kickMemberFromChannel(action) {
             m: membersIds
           },
           body: 'RM',
-          mentionedMembers: removedMembers,
+          mentionedUsers: removedMembers,
           attachments: [],
           type: 'system'
         };
@@ -20457,7 +20464,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 +20671,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 +20720,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 +20746,8 @@ var SceytChatContainer = function SceytChatContainer(_ref) {
     openChatOnUserInteraction: openChatOnUserInteraction,
     autoSelectFirstChannel: autoSelectFirstChannel,
     channelTypeFilter: channelTypeFilter,
-    memberCount: memberCount
+    memberCount: memberCount,
+    disableFrowardMentionsCount: disableFrowardMentionsCount
   }));
 };
 
@@ -21355,7 +21369,7 @@ var Channel = function Channel(_ref3) {
         if (channelDraftMessage) {
           setDraftMessageText(channelDraftMessage.text);
           setDraftMessage({
-            mentionedUsers: channelDraftMessage.mentionedMembers,
+            mentionedUsers: channelDraftMessage.mentionedUsers,
             body: channelDraftMessage.text,
             bodyAttributes: channelDraftMessage.bodyAttributes
           });
@@ -32793,7 +32807,7 @@ var Message$1 = function Message(_ref) {
     handleAddDeleteEmoji: handleReactionAddDelete,
     reactionsDetailsPopupBorderRadius: reactionsDetailsPopupBorderRadius,
     reactionsDetailsPopupHeaderItemsStyle: reactionsDetailsPopupHeaderItemsStyle
-  })), message.reactionTotals && message.reactionTotals.length && (/*#__PURE__*/React__default.createElement(ReactionsContainer, {
+  })), /*#__PURE__*/React__default.createElement(ReactionsContainer, {
     id: message.id + "_reactions_container",
     border: reactionsContainerBorder,
     boxShadow: reactionsContainerBoxShadow,
@@ -32801,8 +32815,9 @@ var Message$1 = function Message(_ref) {
     topPosition: reactionsContainerTopPosition,
     padding: reactionsContainerPadding,
     backgroundColor: reactionsContainerBackground || backgroundSections,
-    rtlDirection: ownMessageOnRightSide && !message.incoming
-  }, /*#__PURE__*/React__default.createElement(MessageReactionsCont, {
+    rtlDirection: ownMessageOnRightSide && !message.incoming,
+    isReacted: message.reactionTotals && message.reactionTotals.length > 0
+  }, message.reactionTotals && message.reactionTotals.length && (/*#__PURE__*/React__default.createElement(MessageReactionsCont, {
     rtlDirection: ownMessageOnRightSide && !message.incoming,
     onClick: handleToggleReactionsPopup
   }, message.reactionTotals.slice(0, reactionsDisplayCount || 5).map(function (summery) {
@@ -32893,7 +32908,7 @@ var EmptySelection = styled.span(_templateObject8$d || (_templateObject8$d = _ta
 }, function (props) {
   return props.disabled && '0.5';
 });
-var ReactionsContainer = styled.div(_templateObject9$b || (_templateObject9$b = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  margin-left: ", ";\n  margin-right: ", ";\n\n  margin-top: 4px;\n  justify-content: flex-end;\n  border: ", ";\n  box-shadow: ", ";\n  filter: drop-shadow(0px 0px 2px rgba(17, 21, 57, 0.08));\n  border-radius: ", ";\n  background-color: ", ";\n  padding: ", ";\n  z-index: 9;\n  ", ";\n"])), function (props) {
+var ReactionsContainer = styled.div(_templateObject9$b || (_templateObject9$b = _taggedTemplateLiteralLoose(["\n  display: inline-flex;\n  margin-left: ", ";\n  margin-right: ", ";\n\n  margin-top: 4px;\n  justify-content: flex-end;\n  border: ", ";\n  box-shadow: ", ";\n  filter: drop-shadow(0px 0px 2px rgba(17, 21, 57, 0.08));\n  border-radius: ", ";\n  background-color: ", ";\n  padding: ", ";\n  z-index: 9;\n  ", ";\n  overflow: hidden;\n  height: ", ";\n  transition: all 0.3s;\n"])), function (props) {
   return props.rtlDirection && 'auto';
 }, function (props) {
   return !props.rtlDirection && 'auto';
@@ -32906,9 +32921,11 @@ var ReactionsContainer = styled.div(_templateObject9$b || (_templateObject9$b =
 }, function (props) {
   return props.backgroundColor;
 }, function (props) {
-  return props.padding || '4px 8px';
+  return !props.isReacted ? '0' : props.padding || '4px 8px';
 }, function (props) {
   return props.topPosition && "\n      position: relative;\n      top: " + props.topPosition + ";\n  ";
+}, function (props) {
+  return props.isReacted ? '16px' : '0';
 });
 var MessageReactionsCont = styled.div(_templateObject0$a || (_templateObject0$a = _taggedTemplateLiteralLoose(["\n  position: relative;\n  display: inline-flex;\n  max-width: 300px;\n  direction: ", ";\n  cursor: pointer;\n"])), function (props) {
   return props.rtlDirection && 'ltr';
@@ -36855,8 +36872,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];
@@ -36982,21 +36999,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;
@@ -37056,7 +37073,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setShouldClearEditor({
         clear: true
       });
-      setMentionedMembers([]);
+      setMentionedUsers([]);
       setMessageBodyAttributes([]);
       dispatch(setCloseSearchChannelsAC(true));
     } else {
@@ -37088,21 +37105,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);
             }
           });
         }
@@ -37110,9 +37127,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;
@@ -37122,7 +37139,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCloseEditMode = function handleCloseEditMode() {
     setEditMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
     dispatch(setMessageToEditAC(null));
   };
   var removeUpload = function removeUpload(attachmentId) {
@@ -37221,7 +37238,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   };
   var handleCut = function handleCut() {
     setMessageText('');
-    setMentionedMembers([]);
+    setMentionedUsers([]);
   };
   var handleEmojiPopupToggle = function handleEmojiPopupToggle(bool) {
     setIsEmojisOpened(bool);
@@ -37289,7 +37306,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     dispatch(clearSelectedMessagesAC());
   };
   var handleSetMentionMember = function handleSetMentionMember(mentionMember) {
-    setMentionedMembers(function (prevState) {
+    setMentionedUsers(function (prevState) {
       return [].concat(prevState, [mentionMember]);
     });
   };
@@ -37670,7 +37687,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
             var messageToSend = {
               metadata: '',
               body: '',
-              mentionedMembers: [],
+              mentionedUsers: [],
               attachments: [{
                 name: v4() + ".mp3",
                 data: recordedFile.file,
@@ -37725,7 +37742,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           dispatch(setMessageForReplyAC(draftMessage.messageForReply));
         }
         setMessageText(draftMessage.text);
-        setMentionedMembers(draftMessage.mentionedMembers);
+        setMentionedUsers(draftMessage.mentionedUsers);
       }
       setShouldClearEditor({
         clear: true,
@@ -37736,7 +37753,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) {
@@ -37771,10 +37788,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
@@ -37782,7 +37799,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       } else {
         setDraftMessageToMap(activeChannel.id, {
           text: messageText,
-          mentionedMembers: mentionedMembers,
+          mentionedUsers: mentionedUsers,
           messageForReply: messageForReply,
           editorState: realEditorState,
           bodyAttributes: messageBodyAttributes
@@ -37802,15 +37819,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();
@@ -37861,7 +37878,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     if (draftMessagesMap[activeChannel.id]) {
       setDraftMessageToMap(activeChannel.id, {
         text: messageText,
-        mentionedMembers: mentionedMembers,
+        mentionedUsers: mentionedUsers,
         messageForReply: messageForReply,
         bodyAttributes: messageBodyAttributes
       });
@@ -38176,7 +38193,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.5",
+  "version": "1.7.2-beta.7",
   "description": "Interactive React UI Components for Sceyt Chat.",
   "author": "Sceyt",
   "license": "MIT",