fix: Global create emoji is overlapping the message with markdown #77790
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -696,6 +696,11 @@ function getZWNJCursorOffset(text: string, cursorPosition: number | undefined | | |
| return textWithZWNJBeforeCursor.length - textBeforeCursor.length; | ||
| } | ||
|
|
||
| function isEmojiOnSeparateLine(line: string) { | ||
| const trimmed = line.replaceAll(/<br\s*\/?>/gi, '').trim(); | ||
| return /^<emoji>.*<\/emoji>$/.test(trimmed); | ||
| } | ||
|
|
||
| export type {HeaderIndices, EmojiPickerList, EmojiPickerListItem}; | ||
|
|
||
| export { | ||
|
|
@@ -725,4 +730,5 @@ export { | |
| processFrequentlyUsedEmojis, | ||
| insertZWNJBetweenDigitAndEmoji, | ||
| getZWNJCursorOffset, | ||
| isEmojiOnSeparateLine, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import {Str} from 'expensify-common'; | ||
| import isEmpty from 'lodash/isEmpty'; | ||
| import React, {useEffect} from 'react'; | ||
| import type {StyleProp, TextStyle} from 'react-native'; | ||
| import Text from '@components/Text'; | ||
| import ZeroWidthView from '@components/ZeroWidthView'; | ||
|
|
@@ -11,7 +11,7 @@ import useTheme from '@hooks/useTheme'; | |
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import convertToLTR from '@libs/convertToLTR'; | ||
| import {canUseTouchScreen} from '@libs/DeviceCapabilities'; | ||
| import {containsOnlyCustomEmoji as containsOnlyCustomEmojiUtil, containsOnlyEmojis as containsOnlyEmojisUtil, isEmojiOnSeparateLine, splitTextWithEmojis} from '@libs/EmojiUtils'; | ||
| import Parser from '@libs/Parser'; | ||
| import Performance from '@libs/Performance'; | ||
| import {getHtmlWithAttachmentID, getTextFromHtml} from '@libs/ReportActionsUtils'; | ||
|
|
@@ -62,7 +62,7 @@ function TextCommentFragment({fragment, styleAsDeleted, reportActionID, styleAsM | |
|
|
||
| const message = isEmpty(iouMessage) ? text : iouMessage; | ||
|
|
||
|
Contributor
There was a problem hiding this comment. ❌ PERF-4 (docs)Removing Fix: Restore the const processedTextArray = useMemo(() => splitTextWithEmojis(message), [message]); |
||
| const processedTextArray = splitTextWithEmojis(message); | ||
|
|
||
| useEffect(() => { | ||
| Performance.markEnd(CONST.TIMING.SEND_MESSAGE, {message: text}); | ||
|
|
@@ -74,7 +74,7 @@ function TextCommentFragment({fragment, styleAsDeleted, reportActionID, styleAsM | |
| // on native, we render it as text, not as html | ||
| // on other device, only render it as text if the only difference is <br /> tag | ||
| const containsOnlyEmojis = containsOnlyEmojisUtil(text ?? ''); | ||
| const containsOnlyCustomEmoji = containsOnlyCustomEmojiUtil(text); | ||
|
Contributor
There was a problem hiding this comment. ❌ PERF-4 (docs)Removing Fix: Restore the const containsOnlyCustomEmoji = useMemo(() => containsOnlyCustomEmojiUtil(text), [text]); |
||
| const containsEmojis = CONST.REGEX.ALL_EMOJIS.test(text ?? ''); | ||
| if (!shouldRenderAsText(html, text ?? '') && !(containsOnlyEmojis && styleAsDeleted)) { | ||
| const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''}></edited>` : ''; | ||
|
|
@@ -90,7 +90,15 @@ function TextCommentFragment({fragment, styleAsDeleted, reportActionID, styleAsM | |
| if (!htmlContent.includes('<emoji>')) { | ||
| htmlContent = Parser.replace(htmlContent, {filterRules: ['emoji'], shouldEscapeText: false}); | ||
| } | ||
| const lines = htmlContent.split(/<br\s*\/?>/i); | ||
| const processedLines = lines.map((line) => { | ||
| if (isEmojiOnSeparateLine(line)) { | ||
| return line.replace('<emoji>', '<emoji ismedium oneline >'); | ||
| } | ||
| return line.replace('<emoji>', '<emoji ismedium>'); | ||
| }); | ||
|
|
||
| htmlContent = processedLines.join('<br />'); | ||
| } | ||
|
|
||
| let htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent; | ||
|
|
@@ -158,4 +166,4 @@ function TextCommentFragment({fragment, styleAsDeleted, reportActionID, styleAsM | |
| ); | ||
| } | ||
|
|
||
| export default TextCommentFragment; | ||
|
Contributor
There was a problem hiding this comment. ❌ PERF-4 (docs)Removing Fix: Restore the export default memo(TextCommentFragment);
paulnjs marked this conversation as resolved.
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@paulnjs You shouldn't remove
import Reacthere. It will cause a crash appThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@truph01 Updated