Skip to content
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

Jump to bottom

Fix emojis display #46478

Closed
wants to merge 3 commits into from
Closed

Fix emojis display #46478

wants to merge 3 commits into from

Conversation

VickyStash
Copy link
Contributor

@VickyStash VickyStash commented Jul 30, 2024 •
edited
Loading

Details

This PR is a follow-up of the #40692 and fixes related issues:

  • Composer - Emojis overlap with each other
  • iOS - Composer - "Write something..." is not in the middle of the composer
  • Workspace - Emoji is cut off in workspace description

Fixed Issues

$ #46443
$ #46448
$ #46451
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console

Case 1:

  1. Go to workspace settings > Profile.
  2. Tap Description.
  3. Clear the description.
  4. Enter an emoji -> Make sure the emoji is not cut off.

Case 2:

  1. Go to any chat
  2. Enter an emoji
  3. Create a new line
  4. Enter another emoji -> Make sure emojis are not overlapped

Case 3: iOS

  1. Open any chat
  2. Make sure "Write something..." is in the middle of the composer the same way as it was before.

Offline tests

Same as in the Tests section

QA Steps

  • Verify that no errors appear in the JS console

Same as in the Tests section

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 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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed 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.js 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.
  • 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

a1
a2

Android: mWeb Chrome

aw2
aw1

iOS: Native

ios3
ios2
ios1

iOS: mWeb Safari

ios_web3
ios_web2
ios_web1

MacOS: Chrome / Safari web2 web1
MacOS: Desktop desktop2 ![desktop1](https://github.com/user-attachments/assets/a47a8459-2a6c-469e-ac1a-86ebccccbb69)

@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Jul 30, 2024

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@VickyStash VickyStash changed the title [WIP] Fix emojis display Fix emojis display Jul 30, 2024
@VickyStash VickyStash marked this pull request as ready for review July 30, 2024 09:46
@VickyStash VickyStash requested a review from a team as a code owner July 30, 2024 09:46
@melvin-bot melvin-bot bot requested review from c3024 and removed request for a team July 30, 2024 09:46
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Jul 30, 2024

@c3024 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]

@VickyStash
Copy link
Contributor Author

^^ @parasharrajat

@parasharrajat
Copy link
Member

On it

@parasharrajat
Copy link
Member

Workspace - Emoji is cut off in workspace description

I thought you said we want to fix this on lib as it is same there.

parasharrajat
parasharrajat suggested changes Jul 30, 2024
View reviewed changes
src/components/Composer/index.native.tsx
Comment on lines +81 to +91
const composerStyle = useMemo(() => {
let lineHeightStyle;

if (doesTextContainOnlyEmojis) {
lineHeightStyle = styles.onlyEmojisTextLineHeight;
} else if (doesTextContainEmojis) {
lineHeightStyle = styles.emojisWithTextLineHeight;
}

return StyleSheet.flatten([style, lineHeightStyle]);
}, [style, doesTextContainEmojis, doesTextContainOnlyEmojis, styles]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is not a good idea as it will change the design for composer for different text. We want to keep the composer to always look same regardless of the text or formatting.

I will test and it how it looks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe on iOS the emojis always will be cut off/overlapped if we leave the line-height 20 for emojis font size 19
image

@VickyStash
Copy link
Contributor Author

Workspace - Emoji is cut off in workspace description

I thought you said we want to fix this on lib as it is same there.

@parasharrajat Could you reference it, please?

@parasharrajat
Copy link
Member

parasharrajat commented Jul 30, 2024 •
edited
Loading

Ah, I think I didn't post this issue on the main PR. Somehow confused it with other emoji clipping issue. Anyways, I think if this issue is present on the markdown lib then we should solve it there.

Looks like we have been discussing something similar here #46444

@parasharrajat
Copy link
Member

Any thoughts @VickyStash ?

@VickyStash
Copy link
Contributor Author

@parasharrajat I don't think that #46448 and #46444 are the same. The lib fix for the 46444 will not have any affect on the 46448 - which is fixed in this PR.

@iwiznia iwiznia mentioned this pull request Jul 30, 2024
Closed
6 tasks
@VickyStash
Copy link
Contributor Author

Closing, since #40692 got reverted.

@VickyStash VickyStash closed this Jul 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/46478/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/46478/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/46478/NewExpensify.dmg https://46478.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@parasharrajat parasharrajat parasharrajat requested changes

@c3024 c3024 Awaiting requested review from c3024

Assignees
No one assigned
Labels
Ready To Build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VickyStash @parasharrajat @roryabraham