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

Mobile emoji picker now has search input #18221

Merged

Conversation

perunt
Copy link
Contributor

@perunt perunt commented May 1, 2023

Details

Fixed Issues

$ #14098
PROPOSAL: GH_LINK_ISSUE(COMMENT)

This is a reimplementation of #14652, as it was causing regression issues. In this pull request, I have only used KeyboardAvoidingView in cases involving the Emoji Suggestion picker. I have also tested the cases that led to regressions and everything seems to be working fine. As I mentioned earlier, we are currently waiting for the merging of the Reanimated KeyboardAvoidingView fix. Once that is done, it should be possible to make the movements of the Emoji Suggestion modal smoother.

Tests

All Platforms:

  1. Create a new account.
  2. Open a new chat conversation.
  3. Access the emoji picker by clicking on the emoji icon in the chat input field.
  4. Make sure the search bar is visible at the top of the emoji picker.
  5. Type "hand" in the search bar and verify that the list of emojis is updated to show relevant hand emojis.
  6. Change the skin tone of an emoji using the appropriate option.
  7. Verify that the skin tone of the selected emoji is updated.
  8. Type the random string "handsmsmsm" in the search bar.
  9. Verify that the message "No results found" is displayed.
  10. Clear the search bar by deleting all text.
  11. Verify that the emoji picker returns to its starter state with all emojis visible and the search bar empty.

Also need to test another modal in chat screen as:

  • open image in chat on all platforms

  • drag and drop files on the web

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

PR Author 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
May-02-2023.16-34-15.mp4
Mobile Web - Chrome
telegram-cloud-document-2-5461104041314496258.mp4
ANDROID_PIXEL_WEB.mp4
Mobile Web - Safari
IOS_14_WEB_2.mp4
IOS_SE_WEB.mp4
Desktop
May-02-2023.16-41-55.mp4
iOS
IOS_14_Native.mp4
Android
telegram-cloud-document-2-5461104041314496229.mp4
Android_native.mp4

@perunt perunt marked this pull request as ready for review May 2, 2023 15:22
@perunt perunt requested a review from a team as a code owner May 2, 2023 15:22
@melvin-bot melvin-bot bot requested review from mollfpr and stitesExpensify and removed request for a team May 2, 2023 15:22
@MelvinBot
Copy link

@stitesExpensify @mollfpr 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]

@mollfpr
Copy link
Contributor

mollfpr commented May 9, 2023

@perunt @stitesExpensify Is this ready to be review?

@perunt
Copy link
Contributor Author

perunt commented May 9, 2023

@mollfpr yes, it should be good to go

@mollfpr
Copy link
Contributor

mollfpr commented May 9, 2023

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
18221.Web.mov
Mobile Web - Chrome
18221.mWeb.Chrome.webm
Mobile Web - Safari
18221.mWeb.Safari.mp4
Desktop
18221.Desktop.mov
iOS
18221.iOS.mp4
Android
18221.Android.webm

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

Sorry for the delay @perunt 🙏

Mostly the changes look good to me 👍; Just leave some thoughts and suggestions for cleanup.

@@ -176,6 +186,8 @@ class EmojiPicker extends React.Component {
}}
anchorOrigin={this.state.emojiPopoverAnchorOrigin}
measureContent={this.measureContent}
outerStyle={Browser.isMobile() && {maxHeight: this.props.windowHeight, marginTop: this.props.viewportOffsetTop}}
Copy link
Contributor

Choose a reason for hiding this comment

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

Why only apply this style to mobile browsers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On the web, we handle keyboards differently, in this case, this style is used to adjust content dimensions when the keyboard is opened.

@perunt
Copy link
Contributor Author

perunt commented May 10, 2023

@mollfpr, I updated keyExtractor. Is everything okay on your end or do you have any issues?

@mollfpr
Copy link
Contributor

mollfpr commented May 11, 2023

@perunt I cannot see the search input mWeb/Chrome with Emulator Pixel 2. Do you think we should worry about this now?

Screen.Recording.2023-05-11.at.09.51.33.mov

@perunt
Copy link
Contributor Author

perunt commented May 11, 2023

To be honest, it's challenging to fit everything into such a small screen, especially with the Navigation and Address Bars (on the web). I know that currently, we have a few UI issues for Pixel 2, and regarding this conversation (https://expensify.slack.com/archives/C01GTK53T8Q/p1676879900179529) I understood that it's not our target device. But we should ask @shawnborton if we need to support such devices.

Additionally, I'll add screenshots from the smallest iPhones (12/13 Mini and SE) to show how it appears now.
Screenshot 2023-05-11 at 15 34 26
Screenshot 2023-05-11 at 15 35 58
Screenshot 2023-05-11 at 15 36 45
Screenshot 2023-05-11 at 15 37 14
Screenshot 2023-05-11 at 15 40 29
Screenshot 2023-05-11 at 15 43 47
Screenshot 2023-05-11 at 16 03 18

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

LGTM and tests well 👍

Just some comments to finalize this.

src/components/EmojiPicker/EmojiPicker.js Outdated Show resolved Hide resolved
src/components/Modal/BaseModal.js Show resolved Hide resolved
@mollfpr

This comment was marked as duplicate.

@perunt
Copy link
Contributor Author

perunt commented Jun 5, 2023

@mollfpr, I've updated it. Should be good now

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

@perunt Sorry for the back and forth, just a minor concern.

src/styles/StyleUtils.js Outdated Show resolved Hide resolved
Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

g75csv9111x41

Thanks @perunt for this PR 👍
All yours @stitesExpensify

@stitesExpensify
Copy link
Contributor

@mollfpr it looks like the checklist changed between when you filled it out and now, so the action is failing. Can you re-check the boxes off with the new format?

@mollfpr
Copy link
Contributor

mollfpr commented Jun 6, 2023

Updated the checklist here.

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

Trigger the check.

Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

Code is looking good! Just one question, and I'm going to do some testing

src/styles/StyleUtils.js Outdated Show resolved Hide resolved
@stitesExpensify stitesExpensify merged commit 9ba7cd3 into Expensify:main Jun 7, 2023
@OSBotify
Copy link
Contributor

OSBotify commented Jun 7, 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 8, 2023

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

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

@OSBotify
Copy link
Contributor

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

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

@sobitneupane
Copy link
Contributor

This minor issue was missed in the PR.

Issue: #22504
Title: The "No results found" message in the emoji picker is scrollable

@sobitneupane
Copy link
Contributor

This issue is a regression from this PR.

Issue: mWeb - Chat - emoji picker presents glitches while scrolling with the keyboard open
Platform: IOS/Safari
Steps to reproduce:

  1. Navigate to any chat.
  2. Tap on Emoji button in composer
  3. Enter a term that has no results
  4. Scroll up and down slowly

@ArekChr
Copy link
Contributor

ArekChr commented Sep 11, 2023

It looks like this issue is a regression from this PR.

Emoji - When scrolling with the down arrows, the emoji selection disappears

  1. Open https://staging.new.expensify.com/
  2. Open any conversation
  3. Open the emoji window
  4. Press the down arrow to scroll downward

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.

9 participants