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

[Web] Change tooltip component to accept generic content #15325

Conversation

hannojg
Copy link
Contributor

@hannojg hannojg commented Feb 21, 2023

Details

For implementing the reactions feature we will need to show content other than just text in the <Tooltip /> component.
This PR adds support for a renderTooptipContent function that can be passed to render any content.

Fixed Issues

$ #15126
PROPOSAL: GH_LINK_ISSUE(COMMENT)

Tests

  • The new code isn't used anywhere in the app yet, so just make sure existing Tooltips work as before.

Offline tests

QA Steps

  • The new code isn't used anywhere in the app yet, so just make sure existing Tooltips work as before.
  • 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 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 correct English and 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 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
Screen.Recording.2023-02-21.at.20.29.21.mov
Mobile Web - Chrome

N/A

Mobile Web - Safari

N/A

Desktop
Screen.Recording.2023-02-21.at.20.42.32.mov
iOS

N/A

Android

N/A

@MelvinBot
Copy link

@s77rt @aldo-expensify 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]

src/components/Tooltip/index.js Outdated Show resolved Hide resolved
src/components/Tooltip/tooltipPropTypes.js Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Feb 21, 2023

How is this supposed to handle content change in the render function?

@hannojg
Copy link
Contributor Author

hannojg commented Mar 5, 2023

Hey @s77rt, I just applied your suggestions!

For content change in the render function it is expected to recreate the render function which will trigger a re-render of the tooltip, which will thus display the updated content.

I updated the storybook entry to reflect that:

Screen.Recording.2023-03-05.at.18.35.13.mov

This is good for review again!

src/components/Tooltip/TooltipRenderedOnPageBody.js Outdated Show resolved Hide resolved
src/components/Tooltip/TooltipRenderedOnPageBody.js Outdated Show resolved Hide resolved
src/stories/Tooltip.stories.js Outdated Show resolved Hide resolved
@hannojg
Copy link
Contributor Author

hannojg commented Mar 6, 2023

Hey @s77rt thx for the second review. I got rid of the duplicated rendering logic.
I in fact found another solution where we don't need to measure the width at all. I couldn't find any regressions while testing, but not sure if I am missing something.

I pushed another solution where we still measure the width.
However id appreciate if you could look at commit

37a4d7d

and see if this could be a good solution as well

@s77rt
Copy link
Contributor

s77rt commented Mar 6, 2023

@hannojg I'm having trouble applying your without width solution. I'm not sure how will this work if the text content of a tooltip changes. Besides that, let's keep the changes minimal here

Copy link
Contributor

@s77rt s77rt left a comment

Choose a reason for hiding this comment

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

Last commit before was better. We were close. The new changes here are mostly unrelated and not required. Please let carry on from the last commit.

src/components/Tooltip/TooltipRenderedOnPageBody.js Outdated Show resolved Hide resolved
src/styles/getTooltipStyles.js Outdated Show resolved Hide resolved
@s77rt

This comment was marked as outdated.

@hannojg
Copy link
Contributor Author

hannojg commented Mar 6, 2023

@s77rt Okay, so I reverted back the new comments and started again from the other one you were okay with. The solution now also works without rendering the content twice and I think is so far the cleanest!
Would appreciate another review 😊

@s77rt
Copy link
Contributor

s77rt commented Mar 6, 2023

@hannojg Thanks a lot for your collaboration. Reviewing...

Copy link
Contributor

@s77rt s77rt 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, just two minor changes.

src/components/Tooltip/TooltipRenderedOnPageBody.js Outdated Show resolved Hide resolved
src/components/Tooltip/TooltipRenderedOnPageBody.js Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Mar 6, 2023

@hannojg Please mark the previous requests are resolved, and once you resolve those two new minor ones, mark them as resolved as well.

@hannojg
Copy link
Contributor Author

hannojg commented Mar 6, 2023

Alright, cleaned it up as suggested @s77rt

@s77rt
Copy link
Contributor

s77rt commented Mar 6, 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 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 correct English and 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 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
web.mp4
web2.mp4
Mobile Web - Chrome
Mobile Web - Safari
Desktop
desktop.mp4
iOS
Android

s77rt
s77rt previously approved these changes Mar 6, 2023
Copy link
Contributor

@s77rt s77rt left a comment

Choose a reason for hiding this comment

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

LGTM! 🚀

mountiny
mountiny previously approved these changes Mar 7, 2023
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

@hannojg Just one question, this is looking good, @stitesExpensify probably can merge once he comes online today

@hannojg hannojg dismissed stale reviews from mountiny and s77rt via 3366b53 March 7, 2023 13:44
@hannojg hannojg force-pushed the hanno/change-tooltip-accept-generic-content branch from 3366b53 to 9863204 Compare March 7, 2023 13:49
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks!

@stitesExpensify stitesExpensify merged commit 28d15b1 into Expensify:main Mar 7, 2023
@OSBotify
Copy link
Contributor

OSBotify commented Mar 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.

@s77rt
Copy link
Contributor

s77rt commented Mar 7, 2023

Can someone please create a tracking payment issue?

@mountiny
Copy link
Contributor

mountiny commented Mar 7, 2023

@s77rt done in the linked issue

@s77rt
Copy link
Contributor

s77rt commented Mar 7, 2023

Thank you! @mountiny

@OSBotify
Copy link
Contributor

OSBotify commented Mar 7, 2023

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

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

@OSBotify
Copy link
Contributor

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

🚀 Deployed to production by https://github.com/roryabraham in version: 1.2.80-2 🚀

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

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