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

Refactor: Migrate EmojiPickerMenu Class component to Functional Component #29241

Merged
merged 48 commits into from
Oct 18, 2023

Conversation

ashuvssut
Copy link
Contributor

@ashuvssut ashuvssut commented Oct 10, 2023

Details

The migration from class component to functional component is 100% complete.

Fixed Issues

$ #16145
PROPOSAL: #16145 (comment)

Tests

  1. click on the emoji picker
  2. verify that emoji search works.
  3. select an emoji. see if it appears in the frequently used emoji header
  4. scroll the emoji list. see if all emoji assests looks loaded as expected
  • 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 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 WEB. Because I only made changes in files that are for web (I have not edited any files with extesnion .native.js (https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 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 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

Android: Native

There we no changes in .native.js file. so native code for EmojiPickerMenu's index.native.js is untouched. However, here the video:-

android.mp4
Android: mWeb Chrome
web1.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
mweb.ios.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
osx.mp4

@ashuvssut ashuvssut requested a review from a team as a code owner October 10, 2023 22:28
@melvin-bot melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team October 10, 2023 22:28
@melvin-bot
Copy link

melvin-bot bot commented Oct 10, 2023

@Santhosh-Sellavel 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]

@github-actions
Copy link
Contributor

github-actions bot commented Oct 10, 2023

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

Copy link
Contributor Author

@ashuvssut ashuvssut left a comment

Choose a reason for hiding this comment

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

There was a merge conflict with my PR.

This conflict was because of this change in another merged PR src/components/EmojiPicker/EmojiPickerMenu/index.js

I have carefully resolved the merge conflict here b420a04

@ashuvssut
Copy link
Contributor Author

Also, the final DIFF you can see is not that helpful

That's why I have made very small small commit. You can start checking the DIFF of the commits, starting from commit message:-progress Expensify#2: props (aa61b9d)

(Sorry for the wierd commit message prefixes😅)

@@ -499,7 +496,7 @@ const EmojiPickerMenu = (props) => {
</View>
{!isFiltered && (
<CategoryShortcutBar
headerEmojis={headerEmojis.current}
headerEmojis={headerEmojis}
Copy link
Contributor Author

@ashuvssut ashuvssut Oct 10, 2023

Choose a reason for hiding this comment

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

Previously, in our class component headerEmojis was a ref. and we should never read ref.current during the component re-render.

So i converted headerEmoji ref to a state instead.

  • Docs reference
    image

Copy link
Contributor

@marcaaron marcaaron left a comment

Choose a reason for hiding this comment

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

We don't use .jsx please undo the name changes.

@ashuvssut ashuvssut changed the title Refactor: Conver EmojiPickerMenu Class component to Functional Component Refactor: Migrate EmojiPickerMenu Class component to Functional Component Oct 11, 2023
@marcaaron
Copy link
Contributor

  • Checklist needs to be filled out completely.
  • You have unsigned commits.
  • Lint is failing

Ask in Slack for help. Maybe @Santhosh-Sellavel can help ya.

Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
…d to class methods

Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
…putOnScreenFocus

Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
… + cleanupEventHandlers()

Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
…ollToHeader()

Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
…firstNonHeaderIndex converted to ref

Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
Signed-off-by: Ashutosh Khanduala <ashu.khanduala@gmail.com>
@ashuvssut
Copy link
Contributor Author

ashuvssut commented Oct 15, 2023

Hey @marcaaron, I just noticed that the workflows require your approval. Could you please take a moment to review this PR?

@Santhosh-Sellavel
Copy link
Collaborator

@ashuvssut Resolve conflicts, please!

@ashuvssut
Copy link
Contributor Author

ashuvssut commented Oct 16, 2023

Hi @Santhosh-Sellavel, I've incorporated all the changes from this pull request to address the merge conflicts.

Merge conflict resolution was done in index.js file

The pull request is now ready for your review! 😊

@Santhosh-Sellavel
Copy link
Collaborator

Santhosh-Sellavel commented Oct 16, 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: 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 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 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 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 & Desktop
Screen.Recording.2023-10-16.at.11.08.49.PM.mov
Mobile Web - Chrome
Screen_Recording_20231016_234740_Chrome.mp4
Mobile Web - Safari
Simulator.Screen.Recording.-.iPhone.15.-.2023-10-17.at.00.12.43.mp4

Copy link
Collaborator

@Santhosh-Sellavel Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

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

LGTM, all yours @marcaaron !

marcaaron
marcaaron previously approved these changes Oct 16, 2023
@marcaaron
Copy link
Contributor

LGTM but there is a lint error that needs to be fixed.

@ashuvssut
Copy link
Contributor Author

@marcaaron the lint warning is taken care of! Please Review again😊

I should have run npm run lint after fixing the latest merge conflict😅

@marcaaron
Copy link
Contributor

😬 you have conflicts again 😭

@ashuvssut
Copy link
Contributor Author

@marcaaron fixing it right away in 30mins!

…expensify-app; branch 'main' of github.com:Expensify/App into refactor/emojipickermenu-try2
@ashuvssut
Copy link
Contributor Author

Hi @marcaaron , I've incorporated all the changes from this pull request to address the merge conflicts.

Merge conflict resolution was done in index.js file

The pull request is now ready for your review! 😊

@ashuvssut
Copy link
Contributor Author

All checks passed!!✨✨✨

@marcaaron marcaaron merged commit 071b9ec into Expensify:main Oct 18, 2023
13 checks passed
@OSBotify
Copy link
Contributor

✋ 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

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.3.87-0 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.3.87-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.87-12 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.3.88-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.88-11 🚀

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

}

setupEventHandlers();
updateFirstNonHeaderIndex(emojis.current);
Copy link
Contributor

Choose a reason for hiding this comment

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

This caused a regression in #30083. Prior to this PR, updating FirstNonHeaderIndex was done in componentDidMount, we should have preserved the same behavior as before.

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.

5 participants