Merge branch 'develop' into regression/email-memory-leak-and-attachme…

…nt-issues
RocketChat · Oct 14, 2022 · 470b035 · 470b035
2 parents a35086e + 9d42405
commit 470b035
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 32 deletions.
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
@@ -3,7 +3,7 @@ import { Box, MessageBody } from '@rocket.chat/fuselage';
 import colors from '@rocket.chat/fuselage-tokens/colors';
 import { MarkupInteractionContext, Markup, UserMention, ChannelMention } from '@rocket.chat/gazzodown';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useLayout } from '@rocket.chat/ui-contexts';
+import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import React, { ReactElement, UIEvent, useCallback, useMemo } from 'react';
 
@@ -19,7 +19,6 @@ const detectEmoji = (text: string): { name: string; className: string; image?: s
 	const html = Object.values(emoji.packages)
 		.reverse()
 		.reduce((html, { render }) => render(html), text);
-
 	const div = document.createElement('div');
 	div.innerHTML = html;
 	return Array.from(div.querySelectorAll('span')).map((span) => ({
@@ -125,6 +124,8 @@ const MessageContentBody = ({ mentions, channels, md }: MessageContentBodyProps)
 		}
 	`;
 
+	const convertAsciiToEmoji = useUserPreference<boolean>('convertAsciiEmoji', true);
+
 	return (
 		<MessageBody>
 			<Box className={messageBodyAdditionalStyles}>
@@ -136,6 +137,7 @@ const MessageContentBody = ({ mentions, channels, md }: MessageContentBodyProps)
 						onUserMentionClick,
 						resolveChannelMention,
 						onChannelMentionClick,
+						convertAsciiToEmoji,
 					}}
 				>
 					<Markup tokens={md} />

diff --git a/packages/gazzodown/src/Markup.spec.tsx b/packages/gazzodown/src/Markup.spec.tsx
@@ -1,9 +1,9 @@
 import { render, screen, cleanup, waitFor } from '@testing-library/react';
 import { Suspense } from 'react';
 
-import Markup from './Markup';
-
 import '@testing-library/jest-dom';
+import { MarkupInteractionContext } from '.';
+import Markup from './Markup';
 
 afterEach(cleanup);
 
@@ -33,6 +33,33 @@ it('renders a big emoji block', () => {
 	expect(screen.getAllByRole('img', { name: ':smile:' })).toHaveLength(2);
 });
 
+it('renders a big emoji block with ASCII emoji', () => {
+	render(
+		<MarkupInteractionContext.Provider
+			value={{
+				convertAsciiToEmoji: false,
+			}}
+		>
+			<Markup
+				tokens={[
+					{
+						type: 'BIG_EMOJI',
+						value: [
+							{ type: 'EMOJI', value: { type: 'PLAIN_TEXT', value: 'slight_smile' }, shortCode: 'slight_smile' },
+							{ type: 'EMOJI', value: undefined, unicode: '🙂' },
+							{ type: 'EMOJI', value: { type: 'PLAIN_TEXT', value: ':)' }, shortCode: 'slight_smile' },
+						],
+					},
+				]}
+			/>
+		</MarkupInteractionContext.Provider>,
+	);
+
+	expect(screen.getByRole('presentation')).toHaveTextContent(':slight_smile:🙂:)');
+	expect(screen.getAllByRole('img')).toHaveLength(2);
+	expect(screen.getAllByRole('img', { name: ':slight_smile:' })).toHaveLength(1);
+});
+
 it('renders a paragraph', () => {
 	render(
 		<Markup

diff --git a/packages/gazzodown/src/MarkupInteractionContext.ts b/packages/gazzodown/src/MarkupInteractionContext.ts
@@ -13,6 +13,7 @@ type MarkupInteractionContextValue = {
 	onUserMentionClick?: (mentionedUser: UserMention) => ((e: UIEvent) => void) | undefined;
 	resolveChannelMention?: (mention: string) => ChannelMention | undefined;
 	onChannelMentionClick?: (mentionedChannel: ChannelMention) => ((e: UIEvent) => void) | undefined;
+	convertAsciiToEmoji?: boolean;
 };
 
 export const MarkupInteractionContext = createContext<MarkupInteractionContextValue>({});
diff --git a/packages/gazzodown/src/emoji/Emoji.tsx b/packages/gazzodown/src/emoji/Emoji.tsx
@@ -1,45 +1,28 @@
-import { MessageEmoji, ThreadMessageEmoji } from '@rocket.chat/fuselage';
 import type * as MessageParser from '@rocket.chat/message-parser';
 import { ReactElement, useMemo, useContext, memo } from 'react';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
+import PlainSpan from '../elements/PlainSpan';
+import EmojiRenderer from './EmojiRenderer';
 
 type EmojiProps = MessageParser.Emoji & {
 	big?: boolean;
 	preview?: boolean;
 };
 
 const Emoji = ({ big = false, preview = false, ...emoji }: EmojiProps): ReactElement => {
-	const { detectEmoji } = useContext(MarkupInteractionContext);
+	const { convertAsciiToEmoji } = useContext(MarkupInteractionContext);
 
-	const fallback = useMemo(() => ('unicode' in emoji ? emoji.unicode : `:${emoji.shortCode ?? emoji.value.value}:`), [emoji]);
+	const asciiEmoji = useMemo(
+		() => ('shortCode' in emoji && emoji.value.value !== emoji.shortCode ? emoji.value.value : undefined),
+		[emoji],
+	);
 
-	const descriptors = useMemo(() => {
-		const detected = detectEmoji?.(fallback);
-		return detected?.length !== 0 ? detected : undefined;
-	}, [detectEmoji, fallback]);
+	if (!convertAsciiToEmoji && asciiEmoji) {
+		return <PlainSpan text={asciiEmoji} />;
+	}
 
-	return (
-		<>
-			{descriptors?.map(({ name, className, image, content }, i) => (
-				<span key={i} title={name}>
-					{preview ? (
-						<ThreadMessageEmoji className={className} name={name} image={image}>
-							{content}
-						</ThreadMessageEmoji>
-					) : (
-						<MessageEmoji big={big} className={className} name={name} image={image}>
-							{content}
-						</MessageEmoji>
-					)}
-				</span>
-			)) ?? (
-				<span role='img' aria-label={fallback.charAt(0) === ':' ? fallback : undefined}>
-					{fallback}
-				</span>
-			)}
-		</>
-	);
+	return <EmojiRenderer big={big} preview={preview} {...emoji} />;
 };
 
 export default memo(Emoji);
diff --git a/packages/gazzodown/src/emoji/EmojiRenderer.tsx b/packages/gazzodown/src/emoji/EmojiRenderer.tsx
@@ -0,0 +1,45 @@
+import { MessageEmoji, ThreadMessageEmoji } from '@rocket.chat/fuselage';
+import type * as MessageParser from '@rocket.chat/message-parser';
+import { ReactElement, useMemo, useContext, memo } from 'react';
+
+import { MarkupInteractionContext } from '../MarkupInteractionContext';
+
+type EmojiProps = MessageParser.Emoji & {
+	big?: boolean;
+	preview?: boolean;
+};
+
+const EmojiRenderer = ({ big = false, preview = false, ...emoji }: EmojiProps): ReactElement => {
+	const { detectEmoji } = useContext(MarkupInteractionContext);
+
+	const fallback = useMemo(() => ('unicode' in emoji ? emoji.unicode : `:${emoji.shortCode ?? emoji.value.value}:`), [emoji]);
+
+	const descriptors = useMemo(() => {
+		const detected = detectEmoji?.(fallback);
+		return detected?.length !== 0 ? detected : undefined;
+	}, [detectEmoji, fallback]);
+
+	return (
+		<>
+			{descriptors?.map(({ name, className, image, content }, i) => (
+				<span key={i} title={name}>
+					{preview ? (
+						<ThreadMessageEmoji className={className} name={name} image={image}>
+							{content}
+						</ThreadMessageEmoji>
+					) : (
+						<MessageEmoji big={big} className={className} name={name} image={image}>
+							{content}
+						</MessageEmoji>
+					)}
+				</span>
+			)) ?? (
+				<span role='img' aria-label={fallback.charAt(0) === ':' ? fallback : undefined}>
+					{fallback}
+				</span>
+			)}
+		</>
+	);
+};
+
+export default memo(EmojiRenderer);