Skip to content

Fix PR 67030 - Emojis disappear after the user sends the message #67696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techievivek merged 3 commits into from
Aug 4, 2025
Merged

Fix PR 67030 - Emojis disappear after the user sends the message #67696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eea11ca
fix emoji disappearing after user comments
dmkt9 Aug 1, 2025
7e4b2e7
Merge branch 'main' into fix/66602-emoji-disappeared
dmkt9 Aug 4, 2025
edf4e6f
update using this
dmkt9 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/CONST/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3470,6 +3470,10 @@ const CONST = {
EMOJIS: /[\p{Extended_Pictographic}\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}](\u200D[\p{Extended_Pictographic}\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/du,
// eslint-disable-next-line max-len, no-misleading-character-class
EMOJI_SKIN_TONES: /[\u{1f3fb}-\u{1f3ff}]/gu,
/** Regex to match emojis that are not wrapped in `<emoji>` tags */
get UNWRAPPED_EMOJI() {
return new RegExp(`(?:(?!<emoji[^>]*>))(${this.EMOJIS.source})(?:(?!</emoji[^>]*>))`, 'gu');
},

PRIVATE_USER_AREA: /[\uE000-\uF8FF\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}]/u,

Expand Down
7 changes: 3 additions & 4 deletions src/components/RenderHTML.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useMemo} from 'react';
import {RenderHTMLSource} from 'react-native-render-html';
import useWindowDimensions from '@hooks/useWindowDimensions';
import Parser from '@libs/Parser';
import CONST from '@src/CONST';

type RenderHTMLProps = {
/** HTML string to render */
Expand All @@ -15,9 +15,8 @@ type RenderHTMLProps = {
function RenderHTML({html: htmlParam}: RenderHTMLProps) {
const {windowWidth} = useWindowDimensions();
const html = useMemo(() => {
// Sanitize emoji characters already wrapped in <emoji> tags to prevent double-tagging.
const sanitizedHtml = htmlParam.replaceAll(/<\/?emoji>/g, '');
return Parser.replace(sanitizedHtml, {shouldEscapeText: false, filterRules: ['emoji']});
// Wrap all unwrapped emojis in `<emoji>` tags.
return htmlParam.replace(CONST.REGEX.UNWRAPPED_EMOJI, '<emoji>$1</emoji>');
}, [htmlParam]);
return (
<RenderHTMLSource
Expand Down
Loading