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 Hoverable component v2 #33257

Merged

Conversation

kacper-mikolajczak
Copy link
Contributor

@kacper-mikolajczak kacper-mikolajczak commented Dec 18, 2023

Details

PR introduces improved changes to Hoverable component.

It is a continuation of 32636 issue.

Fixed Issues

$ #32096
PROPOSAL: https://expensify.slack.com/archives/C05LX9D6E07/p1700572497547219

Tests

  1. Open web app
  2. Hover over LHN avatar elements. Tooltip should be displayed
  3. In Composer, open actions and emoji boxes. The boxes should open over their parent button
  4. Open Settings, go to Workspaces, go back and close sidebar. It should not crash
  5. In devtools, toggle mobile device. It should not crash the app

Offline tests

  1. Go offline
  2. Open Settings, go to Workspaces, pick existing workspace
  3. Open menu and delete workspace
  4. It should properly display deleted workspace with striked-through text

QA Steps

  1. Open web app
  2. Hover over LHN avatar elements. Tooltip should be displayed
  3. In Composer, open actions and emoji boxes. The boxes should open over their parent button
  4. Open Settings, go to Workspaces, go back and close sidebar. It should not crash
  5. In devtools, toggle mobile device. It should not crash the app

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 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 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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
mandroid.mp4
Android: mWeb Chrome
mandroid.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
mios.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

@kacper-mikolajczak
Copy link
Contributor Author

seems like there are some typecheck errors.
But this PR was in Draft status.

Yup, there was some issues with TS while I was fixing other stuff. Thanks for pointing that out, it's been fixed already 👍

@kacper-mikolajczak
Copy link
Contributor Author

Continuing the discussion held here, here is a brief explanation of what was improved:

  • Hoverable is now restricted to support only single child. The usage (there was one in OfflineWithFeedback) has been adjusted to follow that.
  • assignRef was replaced with mergeRefs, which resulted in simpler code
  • additional minor fixes were main while merging current main in order to avoid regressions (see details section of the PR description)

Having that said, I would highly appreciate to review the PR carefully with given QA steps.

@mountiny initial discussion and review of PR was done by @cubuspl42 and I think it might be valuable if we could assign the same reviewer for consistency. Thanks 👍

@kacper-mikolajczak kacper-mikolajczak mentioned this pull request Dec 19, 2023
47 tasks
@kacper-mikolajczak kacper-mikolajczak marked this pull request as ready for review December 19, 2023 13:44
@kacper-mikolajczak kacper-mikolajczak requested a review from a team as a code owner December 19, 2023 13:44
@melvin-bot melvin-bot bot requested review from cubuspl42 and removed request for a team December 19, 2023 13:44
Copy link

melvin-bot bot commented Dec 19, 2023

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

src/libs/mergeRefs.ts Outdated Show resolved Hide resolved
src/pages/home/report/ReportActionItem.js Outdated Show resolved Hide resolved
@cubuspl42
Copy link
Contributor

cubuspl42 commented Dec 20, 2023

Would you start PR threads on the places crucial for fixing the previously identified regressions?

Unless the commit structure separates bugfixes from the organisational changes, but I'm not sure if it does.

Copy link
Contributor Author

@kacper-mikolajczak kacper-mikolajczak left a comment

Choose a reason for hiding this comment

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

Would you start PR threads on the places crucial for fixing the previously identified regressions?

Sure thing @cubuspl42! Here are the crucial places 👍

src/components/Tooltip/BaseTooltip/index.tsx Outdated Show resolved Hide resolved
src/components/Hoverable/index.tsx Show resolved Hide resolved
@mountiny
Copy link
Contributor

@kacper-mikolajczak Seems like some unverified commits creeped in

Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/33257/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/33257/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/33257/NewExpensify.dmg https://33257.pr-testing.expensify.com
Desktop Web

@mountiny
Copy link
Contributor

@cubuspl42 Could you test on the build please?

@cubuspl42
Copy link
Contributor

I'm on it

@cubuspl42
Copy link
Contributor

@kacper-mikolajczak Please update the PR Author Checklist

@kacper-mikolajczak
Copy link
Contributor Author

kacper-mikolajczak commented Dec 28, 2023

@kacper-mikolajczak Seems like some unverified commits creeped in

@mountiny Fixed 👍

@kacper-mikolajczak
Copy link
Contributor Author

@kacper-mikolajczak Please update the PR Author Checklist

Generating dynamic checks...
/home/runner/work/App/App/.github/actions/javascript/authorChecklist/index.js:21[5](https://github.com/Expensify/App/actions/runs/7338235732/job/19980449424?pr=33257#step:3:6)[6](https://github.com/Expensify/App/actions/runs/7338235732/job/19980449424?pr=33257#step:3:7)8
    const [checklistContent, contentAfterChecklist] = contentAfterStartOfChecklist.split(checklistEndsWith);
                                                                                   ^

TypeError: Cannot read properties of undefined (reading 'split')
    at partitionWithChecklist (/home/runner/work/App/App/.github/actions/javascript/authorChecklist/index.js:21568:84)
    at generateDynamicChecksAndCheckForCompletion (/home/runner/work/App/App/.github/actions/javascript/authorChecklist/index.js:21598:[7](https://github.com/Expensify/App/actions/runs/7338235732/job/19980449424?pr=33257#step:3:8)0)

@cubuspl42 Are you familiar with this pipeline error?

@mountiny
Copy link
Contributor

mountiny commented Jan 4, 2024

Great progress on this, with discussion like this one it might be better to bring them to Slack though for faster resolution. Dont hesitate to do that.

Would be nice to wrap this one up sooner than later, great job done so far 🚀

@cubuspl42
Copy link
Contributor

Yeah, you're right. I have a habit of emptying my queue in iterations, but this one deserves a little more urgency. I'll give it a final round of testing and we should be good.

@cubuspl42
Copy link
Contributor

@kacper-mikolajczak Uhm, we've got some conflicts...

@cubuspl42
Copy link
Contributor

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(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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
hoverable-component-web.mov
MacOS: Desktop
hoverable-component-desktop.mov

Copy link
Contributor

@cubuspl42 cubuspl42 left a comment

Choose a reason for hiding this comment

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

Please resolve the conflicts. I'll then do a final check to ensure the conflict resolution broke nothing, both otherwise we're good 👍

@kacper-mikolajczak
Copy link
Contributor Author

@cubuspl42 conflicts resolved 👍

@cubuspl42
Copy link
Contributor

Could you take a look at the TypeScript Checks?

@kacper-mikolajczak
Copy link
Contributor Author

On it! 🔧

@kacper-mikolajczak
Copy link
Contributor Author

@cubuspl42 In order to fix typings, I needed to:

  • update some imports to type imports with import type syntax
  • in BaseTooltip, check if children is valid react element with isValidElement and in if yes, render Hoverable, and render primitve values (rest of ReactNode that could not be used with Hoverable as we cannot hook event callbacks to them, e.g. onMouseEnter) otherwise

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.

Quite complex changes but did not notice anything weird. Curious for @roryabraham thoughts too

@roryabraham
Copy link
Contributor

Hey, just want to set expectations here that since this is just a refactor I'm not going to urgently prioritize reviewing this. I have a number of other more important things on my plate atm, so I don't expect to be able to review this until next week.

@mountiny if you're comfortable with the changes here, feel free to proceed without me

@mountiny
Copy link
Contributor

mountiny commented Jan 9, 2024

Hey, just want to set expectations here that since this is just a refactor I'm not going to urgently prioritize reviewing this. I have a number of other more important things on my plate atm, so I don't expect to be able to review this until next week.

Thank you for this message, I think I would go ahead with merging this, as @cubuspl42 and @kacper-mikolajczak spent lots of time on testing all the issues previously identified

Thanks everyone!

@mountiny mountiny merged commit bddf15d into Expensify:main Jan 9, 2024
15 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jan 9, 2024

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

function Hoverable({isDisabled, ...props}: HoverableProps, ref: Ref<HTMLElement>) {
// If Hoverable is disabled, just render the child without additional logic or event listeners.
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
if (isDisabled || !hasHoverSupport()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

A quick note: You've updated the prop from disabled to isDisabled in this component, but it seems that the corresponding changes haven't been made where this component is being used

Copy link
Contributor

@perunt perunt Jan 9, 2024

Choose a reason for hiding this comment

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

disabled={!_.isUndefined(props.draftMessage)}

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, I see this error when hovering
image

Copy link
Contributor

@perunt perunt Jan 9, 2024

Choose a reason for hiding this comment

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

due to this

children.props.onMouseEnter(e);

Copy link
Contributor Author

@kacper-mikolajczak kacper-mikolajczak Jan 9, 2024

Choose a reason for hiding this comment

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

That's right, thanks for your feedback @perunt! ❤️

Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't dig deeper into the influence of that bug, but it might have crashed due to the context menu on the draft message. Just bump @mountiny to keep it on the radar

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it looks like there was a mismatch between typing and actual usage. I've created a quickfix PR and notified @mountiny, thanks once again 👍

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the quick response ❤️

Copy link
Contributor

Choose a reason for hiding this comment

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

Merged, thank you ❤️

kacper-mikolajczak added a commit to callstack-internal/Expensify-App that referenced this pull request Jan 9, 2024
mountiny added a commit that referenced this pull request Jan 9, 2024
…component-refactor

Quickfix: Hoverable refactor #33257
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.24-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.24-3 🚀

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants