From 54b37c27bdb46fffbc2d7671e80dafa1eea47aab Mon Sep 17 00:00:00 2001
From: Sergey Shpikin <rkfg@rkfg.me>
Date: Sat, 7 Nov 2020 15:25:40 +0300
Subject: [PATCH] Make inline emojis bigger

---
 res/css/views/rooms/_EventTile.scss |  5 +++
 src/HtmlUtils.tsx                   | 52 ++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 592f98590cc3..79420060c775 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -212,6 +212,11 @@ $left-gutter: 64px;
         overflow-y: hidden;
     }
 
+    .mx_EventTile_Emoji {
+        font-size: 1.8rem;
+        vertical-align: bottom;
+    }
+
     &.mx_EventTile_selected .mx_EventTile_line,
     &:hover .mx_EventTile_line {
         border-top-left-radius: 4px;
diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index 7087386128d9..69062fad5d53 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -395,6 +395,46 @@ export interface IOptsReturnString extends IOpts {
     returnString: true;
 }
 
+/**
+ * Wraps emojis in <span> to style them separately from the rest of message. Consecutive emojis (and modifiers) are wrapped
+ * in the same <span>.
+ * @param {string} message the text to format
+ * @param {boolean} isHtmlMessage whether the message contains HTML
+ * @returns if isHtmlMessage is true, returns an array of strings, otherwise return an array of React Elements for emojis
+ * and plain text for everything else
+ */
+function formatEmojis(message: string, isHtmlMessage: boolean): (JSX.Element | string)[] {
+    const emojiToSpan = isHtmlMessage ? (emoji: string) => `<span class='mx_EventTile_Emoji'>${emoji}</span>` :
+        (emoji: string, key: number) => <span key={key} className='mx_EventTile_Emoji'>{emoji}</span>;
+    const result: (JSX.Element | string)[] = [];
+    let text = '';
+    let emojis = '';
+    let key = 0;
+    for (const char of message) {
+        if (mightContainEmoji(char) || ZWJ_REGEX.test(char) || char === '\ufe0f') {
+            if (text) {
+                result.push(text);
+                text = '';
+            }
+            emojis += char;
+        } else {
+            if (emojis) {
+                result.push(emojiToSpan(emojis, key));
+                key++;
+                emojis = '';
+            }
+            text += char;
+        }
+    }
+    if (text) {
+        result.push(text);
+    }
+    if (emojis) {
+        result.push(emojiToSpan(emojis, key));
+    }
+    return result;
+}
+
 /* turn a matrix event body into html
  *
  * content: 'content' of the MatrixEvent
@@ -477,6 +517,9 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
                 });
                 safeBody = phtml.html();
             }
+            if (bodyHasEmoji) {
+                safeBody = formatEmojis(safeBody, true).join('');
+            }
         }
     } finally {
         delete sanitizeParams.textFilter;
@@ -519,6 +562,11 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
         'markdown-body': isHtmlMessage && !emojiBody,
     });
 
+    let emojiBodyElements: JSX.Element[];
+    if (!isDisplayedWithHtml && bodyHasEmoji && !emojiBody) {
+        emojiBodyElements = formatEmojis(strippedBody, false) as JSX.Element[];
+    }
+
     return isDisplayedWithHtml ?
         <span
             key="body"
@@ -526,7 +574,9 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
             className={className}
             dangerouslySetInnerHTML={{ __html: safeBody }}
             dir="auto"
-        /> : <span key="body" ref={opts.ref} className={className} dir="auto">{ strippedBody }</span>;
+        /> : <span key="body" ref={opts.ref} className={className} dir="auto">
+            {emojiBodyElements || strippedBody}
+        </span>;
 }
 
 /**