sceyt-chat-react-uikit 1.9.0 → 1.9.1-beta.2

package/index.js

@@ -14344,6 +14344,7 @@ var messageSlice = createSlice({
       if (state.pinnedMessagesListOpen) {
         state.pinnedMessagesListOpen = false;
         state.pinnedMessagesListCloseRequested = true;
+        state.selectedMessagesMap = null;
       }
     },
     setMessageForReply: function setMessageForReply(state, action) {
@@ -19324,69 +19325,55 @@ function forwardMessage(action) {
         activeChannelId = getActiveChannelId();
         messageTid = null;
         _context15.p = 1;
-        if (!(accompanyingMessage !== null && accompanyingMessage !== void 0 && accompanyingMessage.body)) {
-          _context15.n = 2;
-          break;
-        }
         _context15.n = 2;
-        return effects.call(sendTextMessage, {
-          type: SEND_TEXT_MESSAGE,
-          payload: {
-            message: accompanyingMessage,
-            channelId: channelId,
-            connectionState: connectionState
-          }
-        });
-      case 2:
-        _context15.n = 3;
         return effects.call(getChannelFromMap, channelId);
-      case 3:
+      case 2:
         channel = _context15.v;
         if (channel) {
-          _context15.n = 8;
+          _context15.n = 7;
           break;
         }
         channel = getChannelFromAllChannels(channelId) || null;
         if (channel) {
-          _context15.n = 6;
+          _context15.n = 5;
           break;
         }
         _SceytChatClient = getClient();
-        _context15.n = 4;
+        _context15.n = 3;
         return effects.call(_SceytChatClient.getChannel, channelId);
-      case 4:
+      case 3:
         channel = _context15.v;
         if (!channel) {
-          _context15.n = 5;
+          _context15.n = 4;
           break;
         }
         setChannelInMap(channel);
         addChannelToAllChannels(_extends({}, channel));
         parsedChannel = JSON.parse(JSON.stringify(channel));
-        _context15.n = 5;
+        _context15.n = 4;
         return effects.put(addChannelAC(parsedChannel));
-      case 5:
-        _context15.n = 7;
+      case 4:
+        _context15.n = 6;
         break;
-      case 6:
+      case 5:
         setChannelInMap(channel);
-      case 7:
+      case 6:
         if (!channel) {
           channel = getChannelFromAllChannelsMap(channelId);
         }
-      case 8:
+      case 7:
         if (channel) {
-          _context15.n = 9;
+          _context15.n = 8;
           break;
         }
         throw new Error('Channel not found');
-      case 9:
+      case 8:
         mentionedUserIds = message.mentionedUsers ? message.mentionedUsers.map(function (member) {
           return member.id;
         }) : [];
         attachments = message.attachments;
         if ((channel.type === DEFAULT_CHANNEL_TYPE.BROADCAST || channel.type === DEFAULT_CHANNEL_TYPE.PUBLIC) && !(channel.userRole === 'admin' || channel.userRole === 'owner')) {
-          _context15.n = 18;
+          _context15.n = 17;
           break;
         }
         if (message.attachments && message.attachments.length && action.type !== RESEND_MESSAGE) {
@@ -19439,28 +19426,28 @@ function forwardMessage(action) {
           pendingMessage.forwardingDetails.hops = message.forwardingDetails ? message.forwardingDetails.hops : 1;
         }
         if (!pendingMessage) {
-          _context15.n = 11;
+          _context15.n = 10;
           break;
         }
         if (!(action.type !== RESEND_MESSAGE)) {
-          _context15.n = 11;
+          _context15.n = 10;
           break;
         }
-        _context15.n = 10;
+        _context15.n = 9;
         return effects.call(loadOGMetadataForLinkMessages, [pendingMessage], true);
-      case 10:
-        _context15.n = 11;
+      case 9:
+        _context15.n = 10;
         return effects.call(updateMessage$1, action.type, pendingMessage, channel.id, channelId === activeChannelId, message, isNotShowOwnMessageForward, false);
-      case 11:
+      case 10:
         if (!(connectionState === CONNECTION_STATUS.CONNECTED)) {
-          _context15.n = 17;
+          _context15.n = 16;
           break;
         }
-        _context15.n = 12;
+        _context15.n = 11;
         return effects.call(channel.sendMessage, _extends({}, messageToSend, isNotShowOwnMessageForward ? {
           forwardingDetails: null
         } : {}));
-      case 12:
+      case 11:
         messageResponse = _context15.v;
         responseAttachments = (messageResponse.attachments || attachments || []).map(function (attachment, index) {
           var localAttachment = attachments[index];
@@ -19476,12 +19463,12 @@ function forwardMessage(action) {
           parentMessage: isForward ? null : messageResponse.parentMessage
         });
         if (!(channelId === activeChannelId)) {
-          _context15.n = 13;
+          _context15.n = 12;
           break;
         }
-        _context15.n = 13;
+        _context15.n = 12;
         return effects.put(updateMessageAC(messageToSend.tid, JSON.parse(JSON.stringify(messageUpdateData)), true));
-      case 13:
+      case 12:
         confirmedForward = JSON.parse(JSON.stringify(messageUpdateData));
         updateMessageOnMap(channel.id, {
           messageId: messageToSend.tid,
@@ -19490,15 +19477,15 @@ function forwardMessage(action) {
         addConfirmedMessageToCache(channel.id, confirmedForward);
         messageToUpdate = JSON.parse(JSON.stringify(messageUpdateData));
         if (!channel.unread) {
-          _context15.n = 14;
+          _context15.n = 13;
           break;
         }
-        _context15.n = 14;
+        _context15.n = 13;
         return effects.put(markChannelAsReadAC(channel.id));
-      case 14:
+      case 13:
         resolvedLastMessage = getResolvedChannelLastMessage(channel.id, messageToUpdate, messageToSend);
         if (!lastMessageNeedsUpdate(getReduxChannelLastMessage(channel.id), resolvedLastMessage)) {
-          _context15.n = 16;
+          _context15.n = 15;
           break;
         }
         updateChannelLastMessageOnAllChannels(channel.id, resolvedLastMessage);
@@ -19506,15 +19493,29 @@ function forwardMessage(action) {
           lastMessage: resolvedLastMessage,
           lastReactedMessage: null
         };
-        _context15.n = 15;
+        _context15.n = 14;
         return effects.put(updateChannelDataAC(channel.id, _extends({}, channel, channelUpdateParam), true, false, true));
-      case 15:
+      case 14:
         updateChannelOnAllChannels(channel.id, channelUpdateParam);
-      case 16:
-        _context15.n = 18;
+      case 15:
+        _context15.n = 17;
         break;
-      case 17:
+      case 16:
         throw new Error('Connection required to forward message');
+      case 17:
+        if (!(accompanyingMessage !== null && accompanyingMessage !== void 0 && accompanyingMessage.body)) {
+          _context15.n = 18;
+          break;
+        }
+        _context15.n = 18;
+        return effects.call(sendTextMessage, {
+          type: SEND_TEXT_MESSAGE,
+          payload: {
+            message: accompanyingMessage,
+            channelId: channelId,
+            connectionState: connectionState
+          }
+        });
       case 18:
         _context15.n = 21;
         break;
@@ -25103,7 +25104,7 @@ var getResolvedChannelLastMessage$1 = function getResolvedChannelLastMessage(cha
 };
 function handleChannelMessageEvent(args, SceytChatClient) {
   var _storedChannel$lastMe3, _storedChannel$lastMe4, _store$getState$Messa, _storedChannel$lastMe9, _message$attachments;
-  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, resolvedLastMessageUpdate, shouldUpdateLastMessage, shouldUpdateReduxLastMessage, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
+  var channel, message, messageToHandle, channelFilterTypes, activeChannelId, channelExists, channelForAdd, storedChannel, candidateLastMessage, resolvedLastMessage, messages, lastMessageIsInActiveWindow, isSameLastMessage, shouldRetainStoredDeliveryStatus, resolvedDeliveryStatus, resolvedLastMessageUpdate, shouldUpdateLastMessage, shouldUpdateReduxLastMessage, _store$getState$Messa2, _storedChannel$lastMe7, visibleMessagesMap, lastMessageIsVisible, messagesHasNext, existingMessage, tabIsActive, channelDataUpdate, groupName, showNotifications, _tabIsActive, _state$ThemeReducer$n, _state$ThemeReducer$n2, _state$ThemeReducer$n3, _state$ThemeReducer$n4, _state$ThemeReducer$n5, _state$ThemeReducer$n6, contactsMap, getFromContacts, state, theme, accentColor, textSecondary, messageBody;
   return _regenerator().w(function (_context2) {
     while (1) switch (_context2.n) {
       case 0:
@@ -25130,9 +25131,11 @@ function handleChannelMessageEvent(args, SceytChatClient) {
           return m.id === ((_storedChannel$lastMe5 = storedChannel.lastMessage) === null || _storedChannel$lastMe5 === void 0 ? void 0 : _storedChannel$lastMe5.id) || (storedChannel === null || storedChannel === void 0 ? void 0 : (_storedChannel$lastMe6 = storedChannel.lastMessage) === null || _storedChannel$lastMe6 === void 0 ? void 0 : _storedChannel$lastMe6.tid) === m.tid;
         }) : false;
         isSameLastMessage = (storedChannel === null || storedChannel === void 0 ? void 0 : storedChannel.lastMessage) && resolvedLastMessage && (resolvedLastMessage.id && storedChannel.lastMessage.id === resolvedLastMessage.id || resolvedLastMessage.tid && storedChannel.lastMessage.tid === resolvedLastMessage.tid);
+        shouldRetainStoredDeliveryStatus = !!isSameLastMessage && shouldSkipDeliveryStatusUpdate(message.deliveryStatus, storedChannel.lastMessage.deliveryStatus);
+        resolvedDeliveryStatus = shouldRetainStoredDeliveryStatus ? storedChannel.lastMessage.deliveryStatus : message.deliveryStatus;
         resolvedLastMessageUpdate = isSameLastMessage ? _extends({}, storedChannel.lastMessage, {
           id: message.id,
-          deliveryStatus: message.deliveryStatus,
+          deliveryStatus: resolvedDeliveryStatus,
           state: MESSAGE_STATUS.UNMODIFIED
         }) : resolvedLastMessage;
         shouldUpdateLastMessage = lastMessageNeedsUpdate$1(storedChannel === null || storedChannel === void 0 ? void 0 : storedChannel.lastMessage, resolvedLastMessageUpdate);
@@ -25179,7 +25182,7 @@ function handleChannelMessageEvent(args, SceytChatClient) {
         _context2.n = 5;
         return effects.put(updateMessageAC(existingMessage.id || existingMessage.tid, _extends({}, existingMessage, {
           id: message.id,
-          deliveryStatus: message.deliveryStatus,
+          deliveryStatus: resolvedDeliveryStatus,
           state: MESSAGE_STATUS.UNMODIFIED
         })));
       case 5:
@@ -25202,7 +25205,9 @@ function handleChannelMessageEvent(args, SceytChatClient) {
           }, 50);
         }
       case 10:
-        addMessageToMap(channel.id, message);
+        addMessageToMap(channel.id, _extends({}, message, {
+          deliveryStatus: resolvedDeliveryStatus
+        }));
         channelDataUpdate = _extends({
           messageCount: channelForAdd.messageCount,
           unread: channelForAdd.unread,
@@ -42104,7 +42109,7 @@ function ForwardMessagePopup(_ref2) {
   }, /*#__PURE__*/React__default.createElement(ForwardLinkPreviewIcon, {
     color: accentColor,
     bg: surface1
-  }))) : firstForwardAttachment ? (/*#__PURE__*/React__default.createElement(ForwardPreviewIconWrapper, {
+  }))) : firstForwardAttachment && firstForwardAttachment.type !== attachmentTypes.voice ? (/*#__PURE__*/React__default.createElement(ForwardPreviewIconWrapper, {
     backgroundColor: accentColor,
     iconColor: textOnPrimary
   }, /*#__PURE__*/React__default.createElement(SvgChoseFile, null))) : null, /*#__PURE__*/React__default.createElement(ForwardPreviewInfo, null, /*#__PURE__*/React__default.createElement(ForwardPreviewTitle, {
@@ -45735,6 +45740,8 @@ var PinnedMessagesList = function PinnedMessagesList(_ref) {
   var channelId = _ref.channelId,
     onClose = _ref.onClose,
     closeRequested = _ref.closeRequested,
+    _ref$selectionIsActiv = _ref.selectionIsActive,
+    selectionIsActive = _ref$selectionIsActiv === void 0 ? false : _ref$selectionIsActiv,
     renderMessage = _ref.renderMessage,
     ScrollContainer = _ref.ScrollContainer,
     MessagesContainer = _ref.MessagesContainer;
@@ -45886,7 +45893,7 @@ var PinnedMessagesList = function PinnedMessagesList(_ref) {
       prevMessage: previousMessage || null,
       nextMessage: ((_displayedPins2 = displayedPins[index + 1]) === null || _displayedPins2 === void 0 ? void 0 : _displayedPins2.message) || null,
       index: index
-    }), (pin.message.id || pin.message.tid) && (/*#__PURE__*/React__default.createElement(GoToMessageButton, {
+    }), !selectionIsActive && (pin.message.id || pin.message.tid) && (/*#__PURE__*/React__default.createElement(GoToMessageButton, {
       background: backgroundSections,
       className: 'pinned-message-navigation',
       type: 'button',
@@ -53034,6 +53041,7 @@ var MessageList = function MessageList(_ref) {
     channelId: channel.id,
     onClose: closePinnedMessagesList,
     closeRequested: pinnedMessagesListCloseRequested,
+    selectionIsActive: Boolean(selectedMessagesMap === null || selectedMessagesMap === void 0 ? void 0 : selectedMessagesMap.size),
     ScrollContainer: Container$j,
     MessagesContainer: MessagesBox,
     renderMessage: function renderMessage(_ref3) {
@@ -53440,6 +53448,9 @@ var MessagesContainer = function MessagesContainer(_ref) {
   }));
 };
 
+function isMentionTextUnchanged(originalText, currentText) {
+  return originalText == null || originalText === currentText;
+}
 function convertMentionElement(domNode) {
   var textContent = domNode.textContent;
   if (textContent !== null) {
@@ -53465,6 +53476,7 @@ var MentionNode = /*#__PURE__*/function (_TextNode) {
     value: function exportJSON() {
       return _extends({}, _superPropGet(MentionNode, "exportJSON", this, 3)([]), {
         mentionName: this.__mention.id,
+        mentionText: this.__mention.name,
         type: 'mention',
         version: 1
       });
@@ -53473,9 +53485,26 @@ var MentionNode = /*#__PURE__*/function (_TextNode) {
     key: "createDOM",
     value: function createDOM(config) {
       var dom = _superPropGet(MentionNode, "createDOM", this, 3)([config]);
-      dom.className = 'mention';
+      if (this.isUnchangedMention()) {
+        dom.className = 'mention';
+      }
       return dom;
     }
+  }, {
+    key: "updateDOM",
+    value: function updateDOM(prevNode, dom, config) {
+      var wasUnchangedMention = prevNode.isUnchangedMention();
+      var isUnchangedMention = this.isUnchangedMention();
+      if (wasUnchangedMention !== isUnchangedMention) {
+        dom.classList.toggle('mention', isUnchangedMention);
+      }
+      return _superPropGet(MentionNode, "updateDOM", this, 3)([prevNode, dom, config]);
+    }
+  }, {
+    key: "isUnchangedMention",
+    value: function isUnchangedMention() {
+      return isMentionTextUnchanged(this.__mention.name, this.__text);
+    }
   }, {
     key: "exportDOM",
     value: function exportDOM() {
@@ -53514,7 +53543,11 @@ var MentionNode = /*#__PURE__*/function (_TextNode) {
   }, {
     key: "importJSON",
     value: function importJSON(serializedNode) {
-      var node = $createMentionNode(serializedNode.mentionName);
+      var _serializedNode$menti;
+      var node = $createMentionNode({
+        id: serializedNode.mentionName,
+        name: (_serializedNode$menti = serializedNode.mentionText) != null ? _serializedNode$menti : serializedNode.text
+      });
       node.setTextContent(serializedNode.text);
       node.setFormat(serializedNode.format);
       node.setDetail(serializedNode.detail);
@@ -53686,7 +53719,6 @@ function MentionsContainer(_ref2) {
     selectedIndex = _ref2.selectedIndex,
     selectOptionAndCleanUp = _ref2.selectOptionAndCleanUp,
     setHighlightedIndex = _ref2.setHighlightedIndex,
-    setMentionsIsOpen = _ref2.setMentionsIsOpen,
     channelId = _ref2.channelId,
     alignLeft = _ref2.alignLeft,
     handleLeftOffset = _ref2.handleLeftOffset;
@@ -53728,7 +53760,6 @@ function MentionsContainer(_ref2) {
     };
   }, [selectedIndex]);
   React.useEffect(function () {
-    setMentionsIsOpen(true);
     var menuTimeOut = setTimeout(function () {
       var menuElement = document.getElementById('typeahead-menu');
       if (menuElement) {
@@ -53742,7 +53773,6 @@ function MentionsContainer(_ref2) {
         menuElement.style.zIndex = '-1';
       }
       selectOptionAndCleanUp(null);
-      setMentionsIsOpen(false);
     };
   }, []);
   var handleScroll = React.useCallback(function (e) {
@@ -53792,7 +53822,6 @@ function MentionsPlugin(_ref3) {
     userId = _ref3.userId,
     getFromContacts = _ref3.getFromContacts,
     setMentionMember = _ref3.setMentionMember,
-    setMentionsIsOpen = _ref3.setMentionsIsOpen,
     members = _ref3.members,
     channelId = _ref3.channelId;
   var _useLexicalComposerCo = LexicalComposerContext.useLexicalComposerContext(),
@@ -53866,7 +53895,6 @@ function MentionsPlugin(_ref3) {
       return anchorElementRef.current ? (/*#__PURE__*/React__default.createElement(MentionsContainer, {
         queryString: queryString,
         options: options,
-        setMentionsIsOpen: setMentionsIsOpen,
         selectOptionAndCleanUp: selectOptionAndCleanUp,
         selectedIndex: selectedIndex,
         setHighlightedIndex: setHighlightedIndex,
@@ -54604,6 +54632,48 @@ function EditMessagePlugin(_ref) {
   return null;
 }
 
+function serializeFormattedMessage(messageText, children, offsetList) {
+  var currentOffsetDiff = 0;
+  var newMessageText = messageText;
+  var messageBodyAttributes = [];
+  children.forEach(function (child, index) {
+    var offsetRange = offsetList[index];
+    if (!offsetRange) return;
+    var offset = offsetRange.start;
+    var length = offsetRange.end - offsetRange.start;
+    var attributeOffset = offset + currentOffsetDiff;
+    var attributeTypes = bodyAttributesMapByType[child.format];
+    var isUnchangedMention = child.type === 'mention' && Boolean(child.mentionName) && isMentionTextUnchanged(child.mentionText, child.text);
+    if (isUnchangedMention) {
+      var mentionId = "@" + child.mentionName;
+      var idLength = mentionId.length;
+      newMessageText = "" + newMessageText.slice(0, attributeOffset) + mentionId + newMessageText.slice(attributeOffset + length);
+      currentOffsetDiff += idLength - length;
+      messageBodyAttributes.push({
+        type: 'mention',
+        metadata: child.mentionName,
+        offset: attributeOffset,
+        length: idLength
+      });
+    }
+    if (attributeTypes) {
+      var formattedLength = isUnchangedMention ? ("@" + child.mentionName).length : length;
+      var formattedOffset = attributeOffset;
+      attributeTypes.forEach(function (attributeType) {
+        messageBodyAttributes.push({
+          type: attributeType,
+          metadata: child.metadata || '',
+          offset: formattedOffset,
+          length: formattedLength
+        });
+      });
+    }
+  });
+  return {
+    messageText: newMessageText,
+    bodyAttributes: messageBodyAttributes
+  };
+}
 function parseHTMLToFormattedSegments(html) {
   var parser = new DOMParser();
   var doc = parser.parseFromString(html, 'text/html');
@@ -54833,74 +54903,11 @@ function useFormatMessage(editor, editorState, setMessageBodyAttributes, setMess
         var parsedEditorState = editorState.toJSON();
         var offsetView = offset.$createOffsetView(editor);
         var offsetList = Array.from(offsetView._offsetMap.values());
-        var messageBodyAttributes = [];
         if (parsedEditorState.root && parsedEditorState.root.children && parsedEditorState.root.children.length && (parsedEditorState.root.children[0].children.length > 1 || parsedEditorState.root.children[0].children[0] && (parsedEditorState.root.children[0].children[0].type === 'mention' || parsedEditorState.root.children[0].children[0].format > 0))) {
-          var currentOffsetDiff = 0;
-          var newMessageText = messageText;
-          parsedEditorState.root.children[0].children.forEach(function (child, index) {
-            if (child.type === 'mention') {
-              var offset = offsetList[index].start;
-              var length = offsetList[index].end - offsetList[index].start;
-              var mentionId = "@" + child.mentionName;
-              var idLength = mentionId.length;
-              newMessageText = "" + newMessageText.slice(0, offset + currentOffsetDiff) + mentionId + newMessageText.slice(offset + currentOffsetDiff + length);
-              var menIndex = offset + currentOffsetDiff;
-              currentOffsetDiff += idLength - length;
-              messageBodyAttributes.push({
-                type: 'mention',
-                metadata: child.mentionName,
-                offset: menIndex,
-                length: idLength
-              });
-              if (child.format) {
-                var attributeTypes = bodyAttributesMapByType[child.format];
-                if (attributeTypes.length > 1) {
-                  attributeTypes.forEach(function (attributeType) {
-                    messageBodyAttributes.push({
-                      type: attributeType,
-                      metadata: child.metadata || '',
-                      offset: menIndex,
-                      length: length
-                    });
-                  });
-                } else {
-                  messageBodyAttributes.push({
-                    type: attributeTypes[0],
-                    metadata: child.metadata || '',
-                    offset: menIndex,
-                    length: length
-                  });
-                }
-              }
-            } else {
-              var _attributeTypes = bodyAttributesMapByType[child.format];
-              if (_attributeTypes) {
-                var _offset = offsetList[index].start;
-                var _length = offsetList[index].end - offsetList[index].start;
-                var attIndex = _offset + currentOffsetDiff;
-                if (_attributeTypes.length > 1) {
-                  _attributeTypes.forEach(function (attributeType) {
-                    messageBodyAttributes.push({
-                      type: attributeType,
-                      metadata: child.metadata || '',
-                      offset: attIndex,
-                      length: _length
-                    });
-                  });
-                } else {
-                  messageBodyAttributes.push({
-                    type: _attributeTypes[0],
-                    metadata: child.metadata || '',
-                    offset: attIndex,
-                    length: _length
-                  });
-                }
-              }
-            }
-          });
+          var serializedMessage = serializeFormattedMessage(messageText, parsedEditorState.root.children[0].children, offsetList);
           if (messageText) {
-            setMessageText(newMessageText);
-            setMessageBodyAttributes(messageBodyAttributes);
+            setMessageText(serializedMessage.messageText);
+            setMessageBodyAttributes(serializedMessage.bodyAttributes);
           } else {
             setMessageText(messageToEdit ? messageToEdit.body : '');
           }
@@ -56912,56 +56919,53 @@ var SendMessageInput = function SendMessageInput(_ref3) {
   var _useState16 = React.useState(''),
     browser = _useState16[0],
     setBrowser = _useState16[1];
-  var _useState17 = React.useState(false),
-    mentionsIsOpen = _useState17[0],
-    setMentionsIsOpen = _useState17[1];
-  var _useState18 = React.useState(),
-    inputContainerHeight = _useState18[0],
-    setInputContainerHeight = _useState18[1];
+  var _useState17 = React.useState(),
+    inputContainerHeight = _useState17[0],
+    setInputContainerHeight = _useState17[1];
   var selectedText = React.useRef(null);
+  var _useState18 = React.useState(),
+    typingTimout = _useState18[0],
+    setTypingTimout = _useState18[1];
   var _useState19 = React.useState(),
-    typingTimout = _useState19[0],
-    setTypingTimout = _useState19[1];
-  var _useState20 = React.useState(),
-    inTypingStateTimout = _useState20[0],
-    setInTypingStateTimout = _useState20[1];
+    inTypingStateTimout = _useState19[0],
+    setInTypingStateTimout = _useState19[1];
+  var _useState20 = React.useState(false),
+    inTypingState = _useState20[0],
+    setInTypingState = _useState20[1];
   var _useState21 = React.useState(false),
-    inTypingState = _useState21[0],
-    setInTypingState = _useState21[1];
+    sendMessageIsActive = _useState21[0],
+    setSendMessageIsActive = _useState21[1];
   var _useState22 = React.useState(false),
-    sendMessageIsActive = _useState22[0],
-    setSendMessageIsActive = _useState22[1];
-  var _useState23 = React.useState(false),
-    isSendMessageInFlight = _useState23[0],
-    setIsSendMessageInFlight = _useState23[1];
-  var _useState24 = React.useState([]),
-    attachments = _useState24[0],
-    setAttachments = _useState24[1];
+    isSendMessageInFlight = _useState22[0],
+    setIsSendMessageInFlight = _useState22[1];
+  var _useState23 = React.useState([]),
+    attachments = _useState23[0],
+    setAttachments = _useState23[1];
   var attachmentsRef = React.useRef([]);
+  var _useState24 = React.useState(false),
+    forwardPopupOpen = _useState24[0],
+    setForwardPopupOpen = _useState24[1];
   var _useState25 = React.useState(false),
-    forwardPopupOpen = _useState25[0],
-    setForwardPopupOpen = _useState25[1];
+    deletePopupOpen = _useState25[0],
+    setDeletePopupOpen = _useState25[1];
   var _useState26 = React.useState(false),
-    deletePopupOpen = _useState26[0],
-    setDeletePopupOpen = _useState26[1];
-  var _useState27 = React.useState(false),
-    isIncomingMessage = _useState27[0],
-    setIsIncomingMessage = _useState27[1];
-  var _useState28 = React.useState('.jpg,.jpeg,.png,.gif,.mp4,.mov,.avi,.wmv,.flv,.webm,.jfif'),
-    mediaExtensions = _useState28[0],
-    setMediaExtensions = _useState28[1];
-  var _useState29 = React.useState(''),
-    uploadErrorMessage = _useState29[0],
-    setUploadErrorMessage = _useState29[1];
-  var _useState30 = React.useState(false),
-    viewOnce = _useState30[0],
-    setViewOnce = _useState30[1];
-  var _useState31 = React.useState(areDraftMessagesHydrated()),
-    draftsHydrated = _useState31[0],
-    setDraftsHydrated = _useState31[1];
-  var _useState32 = React.useState(activeChannel.id || ''),
-    composerChannelId = _useState32[0],
-    setComposerChannelId = _useState32[1];
+    isIncomingMessage = _useState26[0],
+    setIsIncomingMessage = _useState26[1];
+  var _useState27 = React.useState('.jpg,.jpeg,.png,.gif,.mp4,.mov,.avi,.wmv,.flv,.webm,.jfif'),
+    mediaExtensions = _useState27[0],
+    setMediaExtensions = _useState27[1];
+  var _useState28 = React.useState(''),
+    uploadErrorMessage = _useState28[0],
+    setUploadErrorMessage = _useState28[1];
+  var _useState29 = React.useState(false),
+    viewOnce = _useState29[0],
+    setViewOnce = _useState29[1];
+  var _useState30 = React.useState(areDraftMessagesHydrated()),
+    draftsHydrated = _useState30[0],
+    setDraftsHydrated = _useState30[1];
+  var _useState31 = React.useState(activeChannel.id || ''),
+    composerChannelId = _useState31[0],
+    setComposerChannelId = _useState31[1];
   var typingOrRecordingIndicator = useSelector(typingOrRecordingIndicatorArraySelector(activeChannel.id));
   var contactsMap = useSelector(contactsMapSelector);
   var connectionStatus = useSelector(connectionStatusSelector, reactRedux.shallowEqual);
@@ -56985,36 +56989,36 @@ var SendMessageInput = function SendMessageInput(_ref3) {
       setIsSendMessageInFlight(false);
     });
   };
-  var _useState33 = React.useState(),
-    realEditorState = _useState33[0],
-    setRealEditorState = _useState33[1];
-  var _useState34 = React.useState(null),
-    floatingAnchorElem = _useState34[0],
-    setFloatingAnchorElem = _useState34[1];
+  var _useState32 = React.useState(),
+    realEditorState = _useState32[0],
+    setRealEditorState = _useState32[1];
+  var _useState33 = React.useState(null),
+    floatingAnchorElem = _useState33[0],
+    setFloatingAnchorElem = _useState33[1];
+  var _useState34 = React.useState(false),
+    isSmallWidthViewport = _useState34[0],
+    setIsSmallWidthViewport = _useState34[1];
   var _useState35 = React.useState(false),
-    isSmallWidthViewport = _useState35[0],
-    setIsSmallWidthViewport = _useState35[1];
-  var _useState36 = React.useState(false),
-    isScrolling = _useState36[0],
-    setIsScrolling = _useState36[1];
+    isScrolling = _useState35[0],
+    setIsScrolling = _useState35[1];
+  var _useState36 = React.useState(null),
+    linkPreview = _useState36[0],
+    setLinkPreview = _useState36[1];
   var _useState37 = React.useState(null),
-    linkPreview = _useState37[0],
-    setLinkPreview = _useState37[1];
-  var _useState38 = React.useState(null),
-    detectedUrl = _useState38[0],
-    setDetectedUrl = _useState38[1];
-  var _useState39 = React.useState(new Set()),
-    dismissedUrls = _useState39[0],
-    setDismissedUrls = _useState39[1];
+    detectedUrl = _useState37[0],
+    setDetectedUrl = _useState37[1];
+  var _useState38 = React.useState(new Set()),
+    dismissedUrls = _useState38[0],
+    setDismissedUrls = _useState38[1];
+  var _useState39 = React.useState(false),
+    isClosingPreview = _useState39[0],
+    setIsClosingPreview = _useState39[1];
   var _useState40 = React.useState(false),
-    isClosingPreview = _useState40[0],
-    setIsClosingPreview = _useState40[1];
+    replyLinkPreviewImageFailed = _useState40[0],
+    setReplyLinkPreviewImageFailed = _useState40[1];
   var _useState41 = React.useState(false),
-    replyLinkPreviewImageFailed = _useState41[0],
-    setReplyLinkPreviewImageFailed = _useState41[1];
-  var _useState42 = React.useState(false),
-    linkPreviewImageFailed = _useState42[0],
-    setLinkPreviewImageFailed = _useState42[1];
+    linkPreviewImageFailed = _useState41[0],
+    setLinkPreviewImageFailed = _useState41[1];
   var addAttachmentByMenu = showChooseFileAttachment && showChooseMediaAttachment;
   var linkify = new LinkifyIt();
   var oGMetadata = useSelector(function (state) {
@@ -57284,7 +57288,7 @@ var SendMessageInput = function SendMessageInput(_ref3) {
           });
         }
       }
-      if (shouldSend && !mentionsIsOpen) {
+      if (shouldSend) {
         if (isSendMessageInFlightRef.current) {
           event.preventDefault();
           event.stopPropagation();
@@ -58797,7 +58801,6 @@ var SendMessageInput = function SendMessageInput(_ref3) {
     userId: user.id,
     getFromContacts: getFromContacts,
     members: activeChannelMembers,
-    setMentionsIsOpen: setMentionsIsOpen,
     channelId: activeChannel === null || activeChannel === void 0 ? void 0 : activeChannel.id
   })), /*#__PURE__*/React__default.createElement(LexicalHistoryPlugin.HistoryPlugin, null), /*#__PURE__*/React__default.createElement(LexicalRichTextPlugin.RichTextPlugin, {
     contentEditable: /*#__PURE__*/React__default.createElement("div", {