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

Update styling in mentions auto-suggestion component #18951

Merged
merged 9 commits into from
Jun 6, 2023

Conversation

szebniok
Copy link
Contributor

@szebniok szebniok commented May 15, 2023

Details

I took a guess with the margins between the avatar, display name and email, as they were not specified exactly in the issue.
@puneetlath Is the highlighted part of the email name readable enough? It wasn't shown on any of the mocks inside the design doc.

Fixed Issues

$ #18795

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Type in @ into the text input
  2. Verify that the styles of suggestions match the mocks from [HOLD for payment 2023-06-15] Update styling in mentions auto-suggestion component #18795
  • 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 / Chrome
    • iOS / native
    • iOS / 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 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

image

image

Mobile Web - Chrome

image
image

Mobile Web - Safari

image

image

Desktop image image
iOS

image

image

Android

image
image

@szebniok szebniok requested a review from a team as a code owner May 15, 2023 13:13
@melvin-bot melvin-bot bot requested review from puneetlath and sobitneupane and removed request for a team May 15, 2023 13:13
@melvin-bot
Copy link

melvin-bot bot commented May 15, 2023

@puneetlath @sobitneupane 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]

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

@szebniok Looks like there is a padding on the top (and probably at the bottom) of the suggestion list in the mock.

Mock PR
Screenshot 2023-05-15 at 19 05 45 Screenshot 2023-05-15 at 19 21 50

@puneetlath puneetlath requested a review from shawnborton May 15, 2023 14:10
@puneetlath
Copy link
Contributor

puneetlath commented May 15, 2023

@szebniok Looks like there is a padding on the top (and probably at the bottom) of the suggestion list in the mock.

Hm, yeah I agree that is there on the mock, but it looks like we don't do it for emojis today. What do you think @shawnborton?

image

I took a guess with the margins between the avatar, display name and email, as they were not specified exactly in the issue.
@puneetlath Is the highlighted part of the email name readable enough?

@shawnborton curious for your thoughts. How do the padding/margins look? And I think Konrad makes a fair point that it's a bit hard to read the alt text when it's highlighted.

image

@szebniok
Copy link
Contributor Author

Hm, yeah I agree that is there on the mock, but it looks like we don't do it for emojis today.

Yes, currently the height of the emoji and mention suggestions is exactly the same.

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

Screenshots/Videos

Web Screenshot 2023-05-15 at 20 36 30
Mobile Web - Chrome Screenshot 2023-05-15 at 20 57 23
Mobile Web - Safari Screenshot 2023-05-15 at 20 55 02
Desktop Screenshot 2023-05-15 at 20 40 02
iOS Screenshot 2023-05-15 at 20 50 55
Android Screenshot 2023-05-15 at 20 51 10

@shawnborton
Copy link
Contributor

Looks like there is a padding on the top (and probably at the bottom) of the suggestion list in the mock.

I like adding the padding to the top/bottom to be consistent.

And I think Konrad makes a fair point that it's a bit hard to read the alt text when it's highlighted.

Can we change the color.textSupporting to be just color.text when the supporting alt text is highlighted?

@shawnborton
Copy link
Contributor

Is this the most recent screenshot?
image

It looks like we aren't using the correct spacing/etc so that things line up better. I do think we can probably share these styles with the emoji suggestion menu.

@puneetlath
Copy link
Contributor

@szebniok would you be able to pick this back up and take it to the finish line this week?

@szebniok
Copy link
Contributor Author

@puneetlath I've updated the padding and the color of the higlighted text. I've updated the screenshots in the first comment.

@puneetlath
Copy link
Contributor

Ok nice. I notice in your screenshots that it seems to look different on Android though.

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

Screenshots/Videos

Web
Screen.Recording.2023-05-26.at.15.49.45.mov
Screenshot 2023-05-27 at 11 03 52
Mobile Web - Chrome
Screen.Recording.2023-05-26.at.15.59.41.mov
Screenshot 2023-05-27 at 11 03 05
Mobile Web - Safari
Screen.Recording.2023-05-26.at.15.54.24.mov
Screenshot 2023-05-27 at 10 58 00
Desktop
Screen.Recording.2023-05-26.at.15.50.48.mov
iOS
Screen.Recording.2023-05-26.at.15.52.53.mov
Screenshot 2023-05-27 at 10 55 12
Android
Screen.Recording.2023-05-26.at.15.57.35.mov
Screenshot 2023-05-27 at 10 59 53

@sobitneupane
Copy link
Contributor

Ok nice. I notice in your screenshots that it seems to look different on Android though.

+1

@szebniok
Copy link
Contributor Author

Fixed the font weight on native Android, I believe that now it is consistent.

iOS Android
image image

sobitneupane
sobitneupane previously approved these changes May 27, 2023
Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

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.

@shawnborton
Copy link
Contributor

Hmm this feels like the styling is still quite a bit off.

Each row should be 40px tall:
image

The icons that are not avatars should be green. They should be at 16x16. They should also be centered inside of a 24x24 box, this way the box matches the same size as the avatars:
image

And there should be 8px padding on the left/right side of the rows, and then 8px margin in between avatar + name + subname.

@szebniok
Copy link
Contributor Author

@shawnborton Thank you for providing the exact pixel values. I didn't have access to the Figma. I've updated the PR and posted new screenshots in the first comment

@shawnborton
Copy link
Contributor

Nice, I think this feels good to me. @puneetlath let me know what you think as well.

@sobitneupane
Copy link
Contributor

@szebniok Looks like you have not pushed the commit yet. I cannot find the commit.

Screenshot 2023-05-31 at 18 11 40

@szebniok
Copy link
Contributor Author

@sobitneupane 😅 pushed it just now.

@puneetlath
Copy link
Contributor

Looks good to me too!

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

Screenshots/Videos

Web Screenshot 2023-06-01 at 22 04 17 Screenshot 2023-06-01 at 22 04 25
Mobile Web - Chrome Screenshot 2023-06-01 at 22 15 05
Mobile Web - Safari Screenshot 2023-06-01 at 22 14 32
Desktop Screenshot 2023-06-01 at 22 15 20
iOS Screenshot 2023-06-01 at 22 15 49
Android Screenshot 2023-06-01 at 22 21 46

@puneetlath
Copy link
Contributor

@sobitneupane just to confirm - you've tested the updated PR on all devices?

@@ -63,25 +63,42 @@ const MentionSuggestions = (props) => {
* @returns {JSX.Element}
*/
const renderSuggestionMenuItem = (item) => {
const displayedText = _.uniq([item.text, item.alternateText]).join(' - ');
const styledTextArray = getStyledTextArray(displayedText, props.prefix);
const isIcon = item.text === CONST.AUTO_COMPLETE_SUGGESTER.HERE_TEXT;
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB: this seems clearer to me.

Suggested change
const isIcon = item.text === CONST.AUTO_COMPLETE_SUGGESTER.HERE_TEXT;
const avatarSize = item.text === CONST.AUTO_COMPLETE_SUGGESTER.HERE_TEXT ? CONST.AVATAR_SIZE.MENTION_ICON : CONST.AVATAR_SIZE.SMALLER;

Copy link
Contributor

Choose a reason for hiding this comment

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

@szebniok thoughts? Last outstanding thing before I merge.

Copy link
Contributor

@puneetlath puneetlath left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@szebniok @sobitneupane I had one small suggestion, but I don't feel strongly, so if you disagree I'm happy to merge.

@sobitneupane
Copy link
Contributor

@puneetlath Yes, I have. Should I add screenshots?

@puneetlath
Copy link
Contributor

@sobitneupane yes if you could update the screenshots that would be great. Just because we saw issues with android styling before, so I want to be confident.

@sobitneupane
Copy link
Contributor

@puneetlath Updated the screenshots.

@puneetlath
Copy link
Contributor

Awesome, thanks!

@puneetlath puneetlath merged commit e8b4aed into Expensify:main Jun 6, 2023
@melvin-bot
Copy link

melvin-bot bot commented Jun 6, 2023

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

@OSBotify
Copy link
Contributor

OSBotify commented Jun 6, 2023

✋ 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
Copy link
Contributor

OSBotify commented Jun 6, 2023

🚀 Deployed to staging by https://github.com/puneetlath in version: 1.3.25-2 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jun 8, 2023

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.25-8 🚀

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

const styledTextArray = getStyledTextArray(displayedText, props.prefix);
const isIcon = item.text === CONST.AUTO_COMPLETE_SUGGESTER.HERE_TEXT;
const styledDisplayName = getStyledTextArray(item.text, props.prefix);
const styledHandle = getStyledTextArray(item.alternateText, props.prefix);
Copy link
Contributor

Choose a reason for hiding this comment

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

https://github.com/Expensify/App/pull/21779/files - bug two same emails display for user without display name

@@ -1028,13 +1029,15 @@ function getAutoCompleteSuggestionItemStyle(highlightedEmojiIndex, rowHeight, ho
function getAutoCompleteSuggestionContainerStyle(itemsHeight, shouldIncludeReportRecipientLocalTimeHeight) {
const optionalPadding = shouldIncludeReportRecipientLocalTimeHeight ? CONST.RECIPIENT_LOCAL_TIME_HEIGHT : 0;
const padding = CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_PADDING - optionalPadding;
const borderWidth = 2;
const height = itemsHeight + 2 * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_INNER_PADDING + borderWidth;
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming from #27140

When changing this logic, we didn't preserve the fix introduced in #18112

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.

7 participants