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.

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

Enlarge emojis in other contexts than just single character messages #47547

Open
wants to merge 44 commits into
base: main
Choose a base branch
from

Conversation

VickyStash
Copy link
Contributor

@VickyStash VickyStash commented Aug 16, 2024

Details

This is another try to merge the PR related to emojis enlarging, the previous one was reverted.

Fixed Issues

$ #4114
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console

Composer:

  1. Draft a message (of any length) with text and emojis
  2. Verify that emojis are larger (17px) compared to the default size for text (15px) in the composer (emojis + text input)

Report history:

  1. Send a message with emojis and text
  2. Verify that emojis are larger (17px) compared to the default size for text (15pt) in the chat history and vertically centered with respect to eachother, such that the baseline of the emoji is below the plain text and the middle of the text vertically aligns with the middle of the emoji [$1000] Make emojis larger in other contexts than just single character messages #4114 (comment)

Settings:

  1. Go to Settings -> Profile and add emoji to your last name
  2. Verify that emoji appear larger (17px) than the rest of the text (15pt) in the text input
  3. Save the changes
  4. Open LHP
  5. Verify that emoji in user's last name appear larger (25px) compared to the rest of the text (22px)

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

android1
android3
android2

Android: mWeb Chrome

android_web1
android_web3
android_web2

iOS: Native

ios1
ios3
ios2

iOS: mWeb Safari

ios_web3
ios_web1
ios_web2

MacOS: Chrome / Safari web1 web3 web2
MacOS: Desktop

desktop1
desktop3
desktop2

Copy link

melvin-bot bot commented Aug 20, 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] Enlarge emojis in other contexts than just single character messages Enlarge emojis in other contexts than just single character messages Aug 21, 2024
@VickyStash VickyStash marked this pull request as ready for review August 21, 2024 10:08
@VickyStash VickyStash requested review from a team as code owners August 21, 2024 10:08
@melvin-bot melvin-bot bot requested review from parasharrajat and removed request for a team August 21, 2024 10:08
Copy link

melvin-bot bot commented Aug 21, 2024

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

# Conflicts:
#	src/components/Composer/index.native.tsx
#	src/pages/home/report/comment/TextCommentFragment.tsx
@tomekzaw
Copy link
Contributor

Both PRs to react-native-live-markdown have been merged:

@VickyStash
Copy link
Contributor Author

The react-native-live-markdown version will be bumped in this PR.

As for this one:

BUG: Text alignment is a little off on the text input as compared to Staging. The text is slightly lifted.

@parasharrajat @tomekzaw
As I mentioned, the styling applied to the input is the same. The only difference is the component that is used. In case of markdown input the text is splitted into span's and displayed. The reason of visual difference is that the vertical alignment of the text inside the input before and inside the span now is different.

Before (Prod) Current version
image image

I achieved more expected alignment by manually applying to the text spans verticalAlign: 'middle'.

Before (Prod) Current version With text spans verticalAlign: 'middle' applied
image image image

But it looks like to be able to handle it we need to add the support for the text data type inside markdownStyle or set the middle alignment for the text spans by default (second option is less safe).
@tomekzaw Do I miss anything? Maybe there is an easier way to handle it?

Note about what I've updated in the markdown lib to align text inside text spans

image

@tomekzaw
Copy link
Contributor

@VickyStash Let me summon @Skalakid who's the author of web implementation of react-native-live-markdown.

@Skalakid Could you please respond to #47547 (comment)?

@Skalakid
Copy link
Contributor

Hi @VickyStash, I think we can just set the middle alignment for the text spans by default in blockUtils. I'm not sure about about adding support for text data type in markdownStyles since text label is web only feature. If we decide to go with this option it would be nice to also add it to native implementation

# Conflicts:
#	src/components/Composer/index.tsx
@VickyStash
Copy link
Contributor Author

@Skalakid It looks like setting the middle alignment by default in blockUtils affects the line spacing in a mutiline input.
Screenshots from main:

Before After
before after

But we can try to update MarkdownTextInput.css with:

.react-native-live-markdown-input-singleline span[data-type="text"] {
  vertical-align: middle;
}

This way it affects only singleline inputs. What do you think?

@Skalakid
Copy link
Contributor

@VickyStash oh okay, I think it a good idea. Let's add the css style 😄

@VickyStash
Copy link
Contributor Author

I've opened the PR for the web fix mentioned above: Expensify/react-native-live-markdown#486

@VickyStash
Copy link
Contributor Author

Updates:
It looks like all of the issues reported during the review are resolved.
We are just waiting for the react-native-live-markdown version is bumbed to the version with iOS fixes. Then we need to update the version to 0.1.146 which includes the web fix.

Note: I'm going to be OOO next week (Sept 16-20) 🌴

# Conflicts:
#	src/pages/home/report/comment/TextCommentFragment.tsx
@VickyStash
Copy link
Contributor Author

I see this PR updates the react-native-live-markdown version and it already has the C+ review. I think it makes sense to wait for this one to be merged. @parasharrajat WDYT?

@parasharrajat
Copy link
Member

parasharrajat commented Sep 23, 2024

Great. Less work for me. 😄

@pecanoro
Copy link
Contributor

Any updates on this one?

@VickyStash
Copy link
Contributor Author

@pecanoro We are still waiting for the blocking PR to be merged, but it looks like it should happen soon.

@VickyStash
Copy link
Contributor Author

@parasharrajat Please, take another look at the PR 🙏

@VickyStash
Copy link
Contributor Author

The PR with react-native-live-markdown upgrade was reverted. But the new one has already been opened: #50047, so waiting for it.

@parasharrajat
Copy link
Member

@VickyStash Wouldn't it be good to merge your changes separately so we don't have to deal with reverts?

@Skalakid
Copy link
Contributor

Skalakid commented Oct 4, 2024

@VickyStash Ohh, sorry, I think there is no possibility of bumping the library right now because inline images were added in 0.1.145, and I'm handling all issues related to it here. Please wait for my PR with the bump. I will do my best to merge it as quickly as we can to unblock you

package.json Outdated
@@ -66,7 +66,7 @@
},
"dependencies": {
"@dotlottie/react-player": "^1.6.3",
"@expensify/react-native-live-markdown": "0.1.143",
"@expensify/react-native-live-markdown": "0.1.163",
Copy link
Contributor

Choose a reason for hiding this comment

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

Since the inline images were added in version 0.1.145, you can only bump it to 0.1.144

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, I need at least 0.1.146 cause it has web fixes for this pr...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants