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

package/components/Messages/PinnedMessagesList.d.ts

@@ -10,10 +10,11 @@ declare type ScrollContainerComponent = React.ComponentType<any>;
 declare type MessagesContainerComponent = React.ComponentType<{
     children?: React.ReactNode;
 }>;
-declare const PinnedMessagesList: ({ channelId, onClose, closeRequested, renderMessage, ScrollContainer, MessagesContainer }: {
+declare const PinnedMessagesList: ({ channelId, onClose, closeRequested, selectionIsActive, renderMessage, ScrollContainer, MessagesContainer }: {
     channelId: string;
     onClose: () => void;
     closeRequested?: boolean | undefined;
+    selectionIsActive?: boolean | undefined;
     renderMessage: RenderPinnedMessage;
     ScrollContainer: ScrollContainerComponent;
     MessagesContainer: MessagesContainerComponent;

package/components/SendMessageInput/FormatMessagePlugin/index.d.ts

@@ -1,5 +1,26 @@
 /// <reference types="react" />
 import { IMessage, IMember } from '../../../types';
+interface SerializedEditorChild {
+    type: string;
+    text: string;
+    format: number;
+    mentionName?: string;
+    mentionText?: string;
+    metadata?: string;
+}
+interface OffsetRange {
+    start: number;
+    end: number;
+}
+/**
+ * Converts Lexical's display text into the wire format used by message
+ * attributes. A mention is only converted to its ID token while its text has
+ * not been changed by the user. Once edited, it becomes ordinary text.
+ */
+export declare function serializeFormattedMessage(messageText: string, children: SerializedEditorChild[], offsetList: OffsetRange[]): {
+    messageText: string;
+    bodyAttributes: any[];
+};
 export default function FormatMessagePlugin({ editorState, setMessageBodyAttributes, setMessageText, setMentionedMember, messageToEdit, activeChannelMembers, contactsMap, getFromContacts }: {
     editorState: any;
     setMessageBodyAttributes: (data: any) => void;
@@ -10,3 +31,4 @@ export default function FormatMessagePlugin({ editorState, setMessageBodyAttribu
     contactsMap: any;
     getFromContacts: boolean;
 }): JSX.Element | null;
+export {};

package/components/SendMessageInput/MentionNode/index.d.ts

@@ -2,7 +2,10 @@ import type { Spread, DOMConversionMap, DOMExportOutput, EditorConfig, LexicalNo
 import { TextNode } from 'lexical';
 export declare type SerializedMentionNode = Spread<{
     mentionName: string;
+    /** The label inserted into the editor, used to detect later text edits. */
+    mentionText?: string;
 }, SerializedTextNode>;
+export declare function isMentionTextUnchanged(originalText: string | null | undefined, currentText: string): boolean;
 export declare class MentionNode extends TextNode {
     __mention: any;
     mentionId: string;
@@ -12,6 +15,8 @@ export declare class MentionNode extends TextNode {
     constructor(mention: any, text?: string, key?: NodeKey);
     exportJSON(): SerializedMentionNode;
     createDOM(config: EditorConfig): HTMLElement;
+    updateDOM(prevNode: MentionNode, dom: HTMLElement, config: EditorConfig): boolean;
+    private isUnchangedMention;
     exportDOM(): DOMExportOutput;
     static importDOM(): DOMConversionMap | null;
     isTextEntity(): true;

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;
@@ -42104,7 +42105,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 +45736,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 +45889,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 +53037,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 +53444,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 +53472,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 +53481,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 +53539,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);
@@ -54604,6 +54633,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 +54904,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 : '');
           }

package/index.modern.js

@@ -14324,6 +14324,7 @@ var messageSlice = createSlice({
       if (state.pinnedMessagesListOpen) {
         state.pinnedMessagesListOpen = false;
         state.pinnedMessagesListCloseRequested = true;
+        state.selectedMessagesMap = null;
       }
     },
     setMessageForReply: function setMessageForReply(state, action) {
@@ -19304,69 +19305,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 call(sendTextMessage, {
-          type: SEND_TEXT_MESSAGE,
-          payload: {
-            message: accompanyingMessage,
-            channelId: channelId,
-            connectionState: connectionState
-          }
-        });
-      case 2:
-        _context15.n = 3;
         return 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 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 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) {
@@ -19419,28 +19406,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 call(loadOGMetadataForLinkMessages, [pendingMessage], true);
-      case 10:
-        _context15.n = 11;
+      case 9:
+        _context15.n = 10;
         return 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 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];
@@ -19456,12 +19443,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 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,
@@ -19470,15 +19457,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 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);
@@ -19486,15 +19473,29 @@ function forwardMessage(action) {
           lastMessage: resolvedLastMessage,
           lastReactedMessage: null
         };
-        _context15.n = 15;
+        _context15.n = 14;
         return 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 call(sendTextMessage, {
+          type: SEND_TEXT_MESSAGE,
+          payload: {
+            message: accompanyingMessage,
+            channelId: channelId,
+            connectionState: connectionState
+          }
+        });
       case 18:
         _context15.n = 21;
         break;
@@ -42084,7 +42085,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, {
@@ -45715,6 +45716,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;
@@ -45866,7 +45869,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',
@@ -53014,6 +53017,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) {
@@ -53420,6 +53424,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) {
@@ -53445,6 +53452,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
       });
@@ -53453,9 +53461,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() {
@@ -53494,7 +53519,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);
@@ -54584,6 +54613,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');
@@ -54813,74 +54884,11 @@ function useFormatMessage(editor, editorState, setMessageBodyAttributes, setMess
         var parsedEditorState = editorState.toJSON();
         var offsetView = $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 : '');
           }

package/package.json

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