fix: Thread message preview

apps/meteor/client/components/GazzodownText.tsx

@@ -1,6 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import type { ChannelMention, UserMention } from '@rocket.chat/gazzodown';
-import { Markup, MarkupInteractionContext } from '@rocket.chat/gazzodown';
+import { PreviewMarkup, Markup, MarkupInteractionContext } from '@rocket.chat/gazzodown';
 import type * as MessageParser from '@rocket.chat/message-parser';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { RouterContext, useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
@@ -23,9 +23,10 @@ type GazzodownTextProps = {
 	}[];
 	channels?: Pick<IRoom, '_id' | 'name'>[];
 	searchText?: string;
+	preview?: boolean;
 };
 
-const GazzodownText = ({ tokens, mentions, channels, searchText }: GazzodownTextProps) => {
+const GazzodownText = ({ tokens, mentions, channels, searchText, preview }: GazzodownTextProps) => {
 	const highlights = useMessageListHighlights();
 	const highlightRegex = useMemo(() => {
 		if (!highlights?.length) {
@@ -114,7 +115,7 @@ const GazzodownText = ({ tokens, mentions, channels, searchText }: GazzodownText
 				onChannelMentionClick,
 			}}
 		>
-			<Markup tokens={tokens} />
+			{!preview ? <Markup tokens={tokens} /> : <PreviewMarkup tokens={tokens} />}
 		</MarkupInteractionContext.Provider>
 	);
 };

apps/meteor/client/components/message/variants/ThreadMessagePreview.tsx

@@ -14,7 +14,7 @@ import {
 } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import React from 'react';
+import React, { memo } from 'react';
 
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import {
@@ -120,4 +120,4 @@ const ThreadMessagePreview = ({ message, showUserAvatar, sequential, ...props }:
 	);
 };
 
-export default ThreadMessagePreview;
+export default memo(ThreadMessagePreview);

apps/meteor/client/components/message/variants/threadPreview/ThreadMessagePreviewBody.tsx

@@ -1,9 +1,11 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { isE2EEMessage } from '@rocket.chat/core-typings';
-import { PreviewMarkup } from '@rocket.chat/gazzodown';
+import { isQuoteAttachment, isE2EEMessage } from '@rocket.chat/core-typings';
+import type { Root } from '@rocket.chat/message-parser';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import React from 'react';
+import React, { memo } from 'react';
+
+import GazzodownText from '../../../GazzodownText';
 
 type ThreadMessagePreviewBodyProps = {
 	message: IMessage;
@@ -14,18 +16,20 @@ const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): R
 	const isEncryptedMessage = isE2EEMessage(message);
 
 	const getMessage = () => {
+		const mdTokens: Root | undefined = message.md && [...message.md];
+		if (message.attachments && isQuoteAttachment(message.attachments[0])) {
+			mdTokens?.shift();
+		}
 		if (!isEncryptedMessage || message.e2e === 'done') {
-			return message.md ? <PreviewMarkup tokens={message.md} /> : <>{message.msg}</>;
+			return mdTokens ? <GazzodownText preview tokens={mdTokens} /> : <>{message.msg}</>;
 		}
-
 		if (isEncryptedMessage && message.e2e === 'pending') {
 			return <>{t('E2E_message_encrypted_placeholder')}</>;
 		}
-
 		return <>{message.msg}</>;
 	};
 
 	return getMessage();
 };
 
-export default ThreadMessagePreviewBody;
+export default memo(ThreadMessagePreviewBody);