Fix emoji only is cut off if wrapped with markdown and contains whitespaces by bernhardoj · Pull Request #53707 · Expensify/App

bernhardoj · 2024-12-06T15:58:25Z

Explanation of Change

Fixed Issues

$ #53546
PROPOSAL: #53546 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Send emojis-only messages to any chat with whitespace (for example, 😸 😄)
Verify the emoji aren't getting cut off

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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 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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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.ts or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
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(theme.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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…spaces

…with-md

melvin-bot · 2024-12-11T07:58:25Z

@ZhenjaHorbach Please 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]

bernhardoj · 2024-12-11T08:10:17Z

I haven't added the screenshot yet because I realize that after adding the emoji line-height to the comment tag, it makes the message height bigger.

PR:

Staging:

I tried reproducing this on plain HTML and it happens too. The div will have a bigger height.

<div style="line-height: 35px; background-color: red;">
    <span style="font-size: 30px; line-height: 35px;">a</span>
    <span style="font-size: 30px; line-height: 35px;">a</span>
</div>

The solution to this is to move the font-size from the spans to the div (from the individual emoji renderer to the comment tag). However, that means the whitespace will have a font-size of 30px too. I want to confirm whether it's fine or not because actually, if we send emojis without markdown and see it on native, the whitespace already has the font-size of 30px because we applied it to the whole text, so applying the solution above will make it consistent between markdown and plain-text.

App/src/pages/home/report/comment/TextCommentFragment.tsx

Lines 114 to 116 in dac90e1

    
           <Text 
        
               style={[ 
        
                   containsOnlyEmojis ? styles.onlyEmojisText : undefined,

(blue: without markdown, red: with markdown)

ZhenjaHorbach · 2024-12-11T10:49:18Z

I will check today !

ZhenjaHorbach · 2024-12-11T12:49:49Z

@bernhardoj
But as far as I understand, visually the whitespaces will still look the same?
And to me consistent between markdown and plain-text sounds logical

bernhardoj · 2024-12-11T13:19:29Z

But as far as I understand, visually the whitespaces will still look the same?

The whitespace will be bigger.

And to me consistent between markdown and plain-text sounds logical

Same, but just want to confirm the changes.

ZhenjaHorbach · 2024-12-12T08:42:55Z

I don't mind about consistent !
@youssef-lr
What do you think about it ?

youssef-lr · 2024-12-16T22:50:04Z

@bernhardoj does this mean that in order to keep a consistent line height we'll have a bigger whitespace between emojis?

bernhardoj · 2024-12-17T02:48:32Z

@youssef-lr

Each emoji has a bigger line height (35) and font size (30). When we apply the line height (35) to the whole element, the whole element will have a bigger height, as shown in my comment here.

To fix that, we need to add a bigger font size (30) to the whole element too, which affects the whitespace too.

before:
😄(30px) (15px)😄(30px)

after:
😄(30px) (30px)😄(30px)

This causes a bigger whitespace, but it actually matches the behavior when the emojis are not rendered as a markdown.

ZhenjaHorbach · 2024-12-19T16:01:54Z

@youssef-lr

Each emoji has a bigger line height (35) and font size (30). When we apply the line height (35) to the whole element, the whole element will have a bigger height, as shown in my comment here.

To fix that, we need to add a bigger font size (30) to the whole element too, which affects the whitespace too.
before:
😄(30px) (15px)😄(30px)

after:
😄(30px) (30px)😄(30px)
This causes a bigger whitespace, but it actually matches the behavior when the emojis are not rendered as a markdown.

@youssef-lr
Friendly bump !

youssef-lr · 2024-12-24T14:04:18Z

I think it's worth having the @Expensify/design take a look here. Could you guys take a look at the comment above please?

shawnborton · 2024-12-24T15:39:18Z

I tend to agree with this statement here:

But as far as I understand, visually the whitespaces will still look the same? And to me consistent between markdown and plain-text sounds logical

ZhenjaHorbach · 2024-12-27T12:07:57Z

I tend to agree with this statement here:

But as far as I understand, visually the whitespaces will still look the same? And to me consistent between markdown and plain-text sounds logical

Nice
Thanks for clarification !

@bernhardoj
Could you update this PR, please ?

…with-md

bernhardoj · 2024-12-27T15:46:50Z

@ZhenjaHorbach updated

ZhenjaHorbach · 2024-12-27T16:33:40Z

Thanks
I will review tomorrow !

ZhenjaHorbach · 2024-12-28T08:04:34Z

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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.ts 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(theme.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 the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

ZhenjaHorbach · 2024-12-28T12:53:26Z

LGTM !

ZhenjaHorbach · 2025-01-06T19:04:04Z

@youssef-lr
Sorry for ping 😅
But we are ready for merge !

ZhenjaHorbach · 2025-01-09T09:40:12Z

@bernhardoj
While we wait for approve
Let's update the branch to the latest version of main !

…with-md

bernhardoj · 2025-01-09T11:02:02Z

Done

ZhenjaHorbach · 2025-01-09T12:50:53Z

Done

Thanks !

OSBotify · 2025-01-10T17:49:25Z

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

github-actions · 2025-01-11T03:37:09Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.0.84-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

github-actions · 2025-01-14T13:35:53Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.84-7 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	failure ❌
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2025-01-14T13:57:49Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.84-7 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

fix emoji only is cut off is wrapped with markdown and contains white…

55ae17f

…spaces

bernhardoj mentioned this pull request Dec 6, 2024

[HOLD for payment 2025-01-21] [$250] Chat - Sending emoji message with markdown, top half is cut off #53546

Closed

8 tasks

bernhardoj added 2 commits December 11, 2024 15:21

Merge branch 'main' into fix/53546-emoji-cut-off-at-top-when-wrapped-…

e319d55

…with-md

fix missing prop

b144f93

bernhardoj marked this pull request as ready for review December 11, 2024 07:58

bernhardoj requested a review from a team as a code owner December 11, 2024 07:58

melvin-bot Bot requested review from ZhenjaHorbach and removed request for a team December 11, 2024 07:58

Merge branch 'main' into fix/53546-emoji-cut-off-at-top-when-wrapped-…

c2edff9

…with-md

apply emoji text only to whole html

94fa563

lint

8e80144

ZhenjaHorbach approved these changes Dec 28, 2024

View reviewed changes

melvin-bot Bot requested a review from youssef-lr December 28, 2024 12:53

Merge branch 'main' into fix/53546-emoji-cut-off-at-top-when-wrapped-…

6b86ca8

…with-md

youssef-lr approved these changes Jan 10, 2025

View reviewed changes

youssef-lr merged commit d22d9b5 into Expensify:main Jan 10, 2025

github-actions Bot mentioned this pull request Jan 11, 2025

Deploy Checklist: New Expensify 2025-01-11 #55109

Closed

39 tasks

Uh oh!

Conversation

bernhardoj commented Dec 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Dec 11, 2024

Uh oh!

bernhardoj commented Dec 11, 2024

Uh oh!

ZhenjaHorbach commented Dec 11, 2024

Uh oh!

ZhenjaHorbach commented Dec 11, 2024

Uh oh!

bernhardoj commented Dec 11, 2024

Uh oh!

ZhenjaHorbach commented Dec 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

youssef-lr commented Dec 16, 2024

Uh oh!

bernhardoj commented Dec 17, 2024

Uh oh!

ZhenjaHorbach commented Dec 19, 2024

Uh oh!

youssef-lr commented Dec 24, 2024

Uh oh!

shawnborton commented Dec 24, 2024

Uh oh!

ZhenjaHorbach commented Dec 27, 2024

Uh oh!

bernhardoj commented Dec 27, 2024

Uh oh!

ZhenjaHorbach commented Dec 27, 2024

Uh oh!

ZhenjaHorbach commented Dec 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Dec 28, 2024

Uh oh!

ZhenjaHorbach commented Jan 6, 2025

Uh oh!

ZhenjaHorbach commented Jan 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bernhardoj commented Jan 9, 2025

Uh oh!

ZhenjaHorbach commented Jan 9, 2025

Uh oh!

OSBotify commented Jan 10, 2025

Uh oh!

github-actions Bot commented Jan 11, 2025

Uh oh!

github-actions Bot commented Jan 14, 2025

Uh oh!

github-actions Bot commented Jan 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bernhardoj commented Dec 6, 2024 •

edited

Loading

ZhenjaHorbach commented Dec 12, 2024 •

edited

Loading

ZhenjaHorbach commented Dec 28, 2024 •

edited

Loading

ZhenjaHorbach commented Jan 9, 2025 •

edited

Loading