Fix cutoff emojis inside code blocks #20287

dummy-1111 · 2023-06-06T17:06:06Z

Details

Fixed Issues

$ #19922
PROPOSAL: #19922 (comment)

Tests

Start iOS App and login with any account
Open any chat
Send inline block including emojis in it like 😄Hi👌 You're welcome. This is the unique👍 opportunity. Please take a look 🙂
Verify that the emojis aren't cut off and properly aligned with text

Verify that no errors appear in the JS console

Offline tests

Start iOS App and login with any account
Open any chat
Send inline block including emojis in it like 😄Hi👌 You're welcome. This is the unique👍 opportunity. Please take a look 🙂
Verify that the emojis aren't cut off and properly aligned with text

QA Steps

Start iOS App and login with any account
Open any chat
Send inline block including emojis in it like 😄Hi👌 You're welcome. This is the unique👍 opportunity. Please take a look 🙂
Verify that the emojis aren't cut off and properly aligned with text

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

19922_mac_chrome.mp4

Mobile Web - Chrome

19922_android_chrome.mp4

Mobile Web - Safari

19922_ios_safari.mp4

Desktop

19922_mac_desktop.mp4

iOS

19922_ios_native.mp4

Android

19922_android_native.mp4

Note:
Inline code blocks has a bug on Android devices as described here. This bug is out of the scope.

… line-height

melvin-bot · 2023-06-06T17:19:47Z

@flodnv @s77rt One of you needs to copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

s77rt · 2023-06-06T19:04:18Z

src/styles/codeStyles/index.ios.js

@@ -1,15 +1,15 @@
 const codeWordWrapper = {
-    height: 20,
+    height: 22,


Isn't 20 enough?

In the case of 20, line-spacing is barely seen. Do you still want to set 20?

Can you please attach two screenshots for 20 and 22

For 22

For 20

@s77rt
22 looks good IMO. What do you think?

@s77rt
Inline code blocks has a bug on Android devices as described here. This bug is out of the scope.

Ah right.

Let's use the value that is closest to mWeb Safari. 22 seems too much difference. Should we keep it 20 or 21? (Just pick the one that match the mWeb Safari the most)

@s77rt
Of course 20 is the closest one, but visually 22 is the most similar. Which do you prefer? Visually 21 isn't good as well.
What about to leave it as is for now?

@s77rt
Do you still want to set height to 20?

No it's okay, not a blocker. We can go ahead with 22

s77rt · 2023-06-06T19:06:49Z

src/CONST.js

@@ -1122,6 +1122,10 @@ const CONST = {
            // eslint-disable-next-line no-misleading-character-class
            /[\n\s,/?"{}[\]()&^%$#<>!*\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,

+        EMOJI_WORD_SPLITTER:


Change name to SPACE_OR_EMOJI

s77rt · 2023-06-07T14:29:30Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

Not applicable due to a known bug

s77rt · 2023-06-07T14:30:43Z

Please update the tests specifying that the emojis should be aligned with the text and not cut and complete the checklist (check Android cases)

dummy-1111 · 2023-06-07T14:35:01Z

PR updated

s77rt · 2023-06-07T14:38:18Z

Move the verify part to another step and not in the checkbox (it can be easily missed)

dummy-1111 · 2023-06-07T14:49:39Z

@s77rt
Please kindly tell me what's wrong with me? Verify are not checkboxes as in #20034?

s77rt · 2023-06-07T14:51:43Z

Start iOS App and login with any account
Open any chat
Send inline block including emojis in it like 😄Hi👌 You're welcome. This is the unique👍 opportunity. Please take a look 🙂

Verify that the emojis aren't cut off and properly aligned with text

to

Start iOS App and login with any account
Open any chat
Send inline block including emojis in it like 😄Hi👌 You're welcome. This is the unique👍 opportunity. Please take a look 🙂
Verify that the emojis aren't cut off and properly aligned with text

Verify that no errors appear in the JS console

dummy-1111 · 2023-06-07T14:56:25Z

PR updated

s77rt · 2023-06-07T14:57:50Z

@s-alves10 Thank you

s77rt

LGTM! 🚀

cc @flodnv

flodnv · 2023-06-07T15:15:33Z

Thanks! In the future please make sure your PR titles are descriptive -- I've updated this one for now 🙇

flodnv · 2023-06-07T15:17:13Z

src/CONST.js

@@ -1122,6 +1122,10 @@ const CONST = {
            // eslint-disable-next-line no-misleading-character-class
            /[\n\s,/?"{}[\]()&^%$#<>!*\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,

+        SPACE_OR_EMOJI:
+            // eslint-disable-next-line no-misleading-character-class
+            /(\s+|(?:[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3)+)/gu,


\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3

is repeated 4 times in this file, would it make sense to somehow extract it in its own constant?

Or said another way, can we reuse the EMOJIS constant here instead of copy pasting it?

@flodnv
Yes. In order to extract it, we have to extract it as string and use new RegExp syntax, but I found that there is no such expression though it has been repeated 3 times already. So I guessed it's intentional.

Do you still want to extract EMOJIS constant as string?

I guessed it's intentional.

I guessed it was not intentional 😄

What do you think @s77rt ?

I doubt this is intentional. Can we extract \p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3? If yes then let's do it

@flodnv @s77rt

For now, unicode property escape(like \p{Extended_Pictographic} in emoji regex) cannot be used in new RegExp constructor in our project. That's why those were not refactored yet

Got it. Sorry for the noob question -- I understand that we cannot use it in new RegExp, but why does this matter here?

Asked another way, why can we not have (pseudo code):

EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu, SPACE_OR_EMOJI: /(\s+|(?:EMOJIS)+)/gu,

@flodnv
/.../gu isn't a string, it's a RegExp object. We can't embed it inside another RegExp object like that.

Ohhhh 👍 Thanks!

OSBotify · 2023-06-07T21:33:40Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-06-08T17:02:12Z

🚀 Deployed to staging by https://github.com/flodnv in version: 1.3.26-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-06-13T00:22:54Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.26-4 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

parasharrajat · 2023-06-13T19:52:34Z

src/styles/codeStyles/index.ios.js

@@ -1,15 +1,15 @@
 const codeWordWrapper = {
-    height: 20,
+    height: 22,


We kept it low to match the design requirements. Now the line must be bigger and inconsistent across platforms.

Also, Are all platforms looking the same?

Did we take design approval on this?

sangar-1028 added 3 commits June 6, 2023 10:09

fix: change word splitting logic in WrappedText to include emojis

4554e70

fix: increase code word-wrapper, word-style and text-style height and…

a84f859

… line-height

fix: run prettier

6949923

dummy-1111 marked this pull request as ready for review June 6, 2023 17:19

dummy-1111 requested a review from a team as a code owner June 6, 2023 17:19

melvin-bot bot requested review from flodnv and s77rt and removed request for a team June 6, 2023 17:19

dummy-1111 mentioned this pull request Jun 6, 2023

[HOLD for payment 2023-06-19] [$1000] IOS - Chat - Top of the emoji inside the inline block is cut off #19922

Closed

6 tasks

s77rt suggested changes Jun 6, 2023

View reviewed changes

fix: rename to SPACE_OR_EMOJI

79c6be4

s77rt approved these changes Jun 7, 2023

View reviewed changes

flodnv changed the title ~~fix: issue 19922~~ Fix cutoff emojis inside code blocks Jun 7, 2023

flodnv reviewed Jun 7, 2023

View reviewed changes

flodnv approved these changes Jun 7, 2023

View reviewed changes

flodnv merged commit eb718c0 into Expensify:main Jun 7, 2023

OSBotify mentioned this pull request Jun 8, 2023

Deploy Checklist: New Expensify 2023-06-08 #20466

Closed

74 tasks

parasharrajat reviewed Jun 13, 2023

View reviewed changes

dummy-1111 deleted the fix/issue-19922 branch November 22, 2023 16:43

Fix cutoff emojis inside code blocks #20287

Fix cutoff emojis inside code blocks #20287

Conversation

dummy-1111 commented Jun 6, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dummy-1111 Jun 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

s77rt commented Jun 7, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

s77rt commented Jun 7, 2023

dummy-1111 commented Jun 7, 2023

s77rt commented Jun 7, 2023

dummy-1111 commented Jun 7, 2023

s77rt commented Jun 7, 2023

dummy-1111 commented Jun 7, 2023

s77rt commented Jun 7, 2023

s77rt left a comment

Choose a reason for hiding this comment

flodnv commented Jun 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dummy-1111 Jun 7, 2023 • edited Loading

Choose a reason for hiding this comment

flodnv Jun 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OSBotify commented Jun 7, 2023

OSBotify commented Jun 8, 2023

OSBotify commented Jun 13, 2023

Choose a reason for hiding this comment

dummy-1111 commented Jun 6, 2023 •

edited

Loading

dummy-1111 Jun 7, 2023 •

edited

Loading

s77rt commented Jun 7, 2023 •

edited

Loading

dummy-1111 Jun 7, 2023 •

edited

Loading

flodnv Jun 7, 2023 •

edited

Loading