Merge pull request #19798 from kushu7/fix-19605

fix editing just emoji cuts top part android
Expensify · Jun 2, 2023 · 8acc630 · 8acc630
2 parents d8b1d84 + d81b8a7
commit 8acc630
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
@@ -114,11 +114,13 @@ const ReportActionItemFragment = (props) => {
 
                 return <RenderHTML html={props.source === 'email' ? `<email-comment>${htmlContent}</email-comment>` : `<comment>${htmlContent}</comment>`} />;
             }
+            const containsOnlyEmojis = EmojiUtils.containsOnlyEmojis(text);
+
             return (
                 <Text
                     family="EMOJI_TEXT_FONT"
                     selectable={!DeviceCapabilities.canUseTouchScreen() || !props.isSmallScreenWidth}
-                    style={[EmojiUtils.containsOnlyEmojis(text) ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}
+                    style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}
                 >
                     {convertToLTR(Str.htmlDecode(text))}
                     {Boolean(props.fragment.isEdited) && (
@@ -129,7 +131,7 @@ const ReportActionItemFragment = (props) => {
                         >
                             <Text
                                 selectable={false}
-                                style={[styles.w1, styles.userSelectNone]}
+                                style={[containsOnlyEmojis ? styles.onlyEmojisTextLineHeight : undefined, styles.w1, styles.userSelectNone]}
                             >
                                 {' '}
                             </Text>

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -1229,6 +1229,10 @@ const styles = {
         lineHeight: variables.fontSizeOnlyEmojisHeight,
     },
 
+    onlyEmojisTextLineHeight: {
+        lineHeight: variables.fontSizeOnlyEmojisHeight,
+    },
+
     createMenuPositionSidebar: (windowHeight) => ({
         horizontal: 18,
         vertical: windowHeight - 100,