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 PDFView/index.js to function component #36809

Closed
wants to merge 11 commits into from

Conversation

s-alves10
Copy link
Contributor

@s-alves10 s-alves10 commented Feb 19, 2024

Details

Migrate PDFView/index.js to function component

Fixed Issues

$ #16186
PROPOSAL: #16186 (comment)

Tests

  1. Open ND and log in with any account
  2. Navigate to any chat
  3. [WEB AND MOBILE WEB] Tap "+" button near the main composer and select "Add attachment"
  4. [WEB AND MOBILE WEB] Attach normal pdf document and verify that the pdf is displayed properly in preview
  5. [WEB AND MOBILE WEB] Send the pdf
  6. [WEB AND MOBILE WEB] Attach protected pdf document and verify that the pdf is displayed properly in preview
  7. [WEB AND MOBILE WEB] Send the pdf
  8. [WEB AND MOBILE WEB] Tap pdf documents in the chat and they are displayed properly
  • Verify that no errors appear in the JS console

Offline tests

  1. Open ND and log in with any account
  2. Navigate to any chat
  3. [WEB AND MOBILE WEB] Tap "+" button near the main composer and select "Add attachment"
  4. [WEB AND MOBILE WEB] Attach normal pdf document and verify that the pdf is displayed properly in preview
  5. [WEB AND MOBILE WEB] Send the pdf
  6. [WEB AND MOBILE WEB] Attach protected pdf document and verify that the pdf is displayed properly in preview
  7. [WEB AND MOBILE WEB] Send the pdf
  8. [WEB AND MOBILE WEB] Tap pdf documents in the chat and they are displayed properly

QA Steps

  1. Open ND and log in with any account
  2. Navigate to any chat
  3. [WEB AND MOBILE WEB] Tap "+" button near the main composer and select "Add attachment"
  4. [WEB AND MOBILE WEB] Attach normal pdf document and verify that the pdf is displayed properly in preview
  5. [WEB AND MOBILE WEB] Send the pdf
  6. [WEB AND MOBILE WEB] Attach protected pdf document and verify that the pdf is displayed properly in preview
  7. [WEB AND MOBILE WEB] Send the pdf
  8. [WEB AND MOBILE WEB] Tap pdf documents in the chat and they are displayed properly
  • 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: 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
16186_android_native.mp4
Android: mWeb Chrome
16186_android_chrome.mp4
iOS: Native
16186_ios_native.mp4
iOS: mWeb Safari
16186_ios_safari.mp4
MacOS: Chrome / Safari
16186_mac_chrome.mp4
MacOS: Desktop
16186_mac_desktop.mp4

@s-alves10 s-alves10 marked this pull request as ready for review February 20, 2024 07:02
@s-alves10 s-alves10 requested a review from a team as a code owner February 20, 2024 07:02
@melvin-bot melvin-bot bot requested review from ishpaul777 and removed request for a team February 20, 2024 07:03
Copy link

melvin-bot bot commented Feb 20, 2024

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

@s-alves10
Copy link
Contributor Author

@ishpaul777

friendly bump

@ishpaul777
Copy link
Contributor

reviewing today 👀

@ishpaul777
Copy link
Contributor

ishpaul777 commented Feb 21, 2024

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

not applicable

Android: mWeb Chrome
Screen.Recording.2024-03-03.at.6.10.41.AM.mov
iOS: Native

not applicable

iOS: mWeb Safari
Screen.Recording.2024-03-03.at.6.04.47.AM.mov
MacOS: Chrome / Safari
Untitled-1.mov
MacOS: Desktop
Screen.Recording.2024-03-03.at.6.17.46.AM.mov

@ishpaul777

This comment was marked as outdated.

const [isKeyboardOpen, setIsKeyboardOpen] = useState(false);
const prevWindowHeight = usePrevious(windowHeight);

useEffect(() => {
Copy link
Contributor

@ishpaul777 ishpaul777 Feb 21, 2024

Choose a reason for hiding this comment

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

do we even need this in a useEffect if this runs only on first render?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes

Copy link
Contributor

Choose a reason for hiding this comment

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

Why?

}
}
// eslint-disable-next-line react-hooks/exhaustive-deps
Copy link
Contributor

Choose a reason for hiding this comment

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

why this rule disabled ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This effect has an additional dependency: toggleKeyboardOnSmallScreens. This method depends on isSmallScreenWidth and onToggleKeyboard. We need to prevent this effect from running when they are changed. That's the reason

Copy link
Contributor

Choose a reason for hiding this comment

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

lets add a comment for explaination 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

return actualHeight;
},
// eslint-disable-next-line react-hooks/exhaustive-deps
[numPages, calculatePageWidth],
Copy link
Contributor

Choose a reason for hiding this comment

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

why do we need numPages as dependency?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually we should have pageViewports as its dependency.
But pageViewports is an object(array) and changed every time the document is loaded. Having it as a state and specifying as the dependency of this method would re-render the component every time the document is loaded and would cause the component infinite re-render. And having this as a ref wouldn't change the calculatePageWidth method after the document is loaded.

As you can see, pageViewports and numPages are set when the document is loaded, but numPages is a scalar value and not changed as long as the document is not changed. So specifying this as a dependency instead of pageViewports would prevent the infinite re-render. And when the document is changed, it would change as well

This is the reason I added numPages as a dependency instead of pageViewports

Copy link
Contributor

Choose a reason for hiding this comment

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

lets add a comment here also

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@ishpaul777
Copy link
Contributor

Overall looks great, some minor comments for clarifications @s-alves10

@s-alves10 s-alves10 requested a review from ishpaul777 February 21, 2024 16:37
@ishpaul777
Copy link
Contributor

ishpaul777 commented Feb 22, 2024

i'll take another look over the weekend

@s-alves10
Copy link
Contributor Author

@ishpaul777 friendly bump

@ishpaul777
Copy link
Contributor

ishpaul777 commented Feb 26, 2024

Can you please merge main, review comments have been addressed 👍 I'll work on checklist and videos

@s-alves10
Copy link
Contributor Author

Please take a look again @ishpaul777

@ishpaul777
Copy link
Contributor

I will complete this today @s-alves10

@ishpaul777
Copy link
Contributor

ishpaul777 commented Feb 27, 2024

@s-alves10 I found while adjusting window width, the pages has a lot of space between them can you give a quick look to see if this comes from this PR (becuase i can't repro on staging)

Screen.Recording.2024-02-27.at.6.13.08.PM-1.mov

@ishpaul777
Copy link
Contributor

after entering a correct password, this screen shows for a brief moment (not repro on staging)

Screenshot 2024-02-27 at 6 23 42 PM
Screen.Recording.2024-02-27.at.6.22.42.PM.mov

@ishpaul777
Copy link
Contributor

after entering a wrong password it shows this screen instead of error

Screenshot 2024-02-27 at 6 23 42 PM
Screen.Recording.2024-02-27.at.6.25.49.PM.mov

@s-alves10
Copy link
Contributor Author

Let me check @ishpaul777

@s-alves10
Copy link
Contributor Author

@ishpaul777

I found while adjusting window width, the pages has a lot of space between them can you give a quick look to see if this comes from this PR (becuase i can't repro on staging)

I can reproduce this issue on staging

bandicam.2024-02-27.23-30-22-679.mp4

@s-alves10
Copy link
Contributor Author

@ishpaul777

I've fixed the above errors related to password. Please take a look

@s-alves10
Copy link
Contributor Author

Can you please take a look again? @ishpaul777

@s-alves10
Copy link
Contributor Author

@ishpaul777

@ishpaul777
Copy link
Contributor

Thanks for your patience @s-alves10 I'll priortize the review for tomorrow ending my day for today 🙇‍♂️

Comment on lines 59 to 64
// Use window height changes to toggle the keyboard. To maintain keyboard state
// on all platforms we also use focus/blur events. So we need to make sure here
// that we avoid redundant keyboard toggling.
// Minus 100px is needed to make sure that when the internet connection is
// disabled in android chrome and a small 'No internet connection' text box appears,
// we do not take it as a sign to open the keyboard
Copy link
Contributor

Choose a reason for hiding this comment

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

Why comment is removed ?

Copy link
Contributor

@ishpaul777 ishpaul777 left a comment

Choose a reason for hiding this comment

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

just add the missing comment back rest LGTM 👍

@melvin-bot melvin-bot bot requested a review from puneetlath March 3, 2024 00:59
const ratioWidth = this.props.maxCanvasWidth / width;
const ratioArea = Math.sqrt(this.props.maxCanvasArea / nbPixels);
const ratio = Math.min(ratioHeight, ratioArea, ratioWidth);
const getDevicePixelRatio = useCallback(
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we move this function outside? So we don't have to memoize it? And just pass it the props it needs to do the calculations as arguments?

* It depends on a screen size. Also, the app should take into account the page borders.
* @returns {Number}
*/
const calculatePageWidth = useCallback(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Same question here. Can we move it outside the component function?

calculatePageHeight(pageIndex) {
if (this.state.pageViewports.length === 0 || _.some(this.state.pageViewports, (viewport) => !viewport)) {
Log.warn('Dev error: calculatePageHeight() in PDFView called too early');
const calculatePageHeight = useCallback(
Copy link
Contributor

Choose a reason for hiding this comment

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

Same question about this function.

@puneetlath
Copy link
Contributor

@ishpaul777 can you re-review and then ping me again when you're ready for me to take another look?

@ishpaul777
Copy link
Contributor

sure i'll ping 👍, @s-alves10 Can you address @puneetlath review comments

@ishpaul777
Copy link
Contributor

@s-alves10 Any updates?

@puneetlath
Copy link
Contributor

@s-alves10 will you be able to take this to the finish line? If we don't hear back by tomorrow I'm going to proceed with hiring someone else.

@s-alves10
Copy link
Contributor Author

@puneetlath
Due to my health, I am not able to continue working for a while. Please go with other one.

@puneetlath
Copy link
Contributor

Sorry to hear that @s-alves10 😞

@ishpaul777
Copy link
Contributor

ishpaul777 commented Mar 21, 2024

@puneetlath Can we close this PR/ or add a hold in title so this dont fall overdue in K2

@puneetlath
Copy link
Contributor

Good call. Closing it out and putting the issue on hold.

@puneetlath puneetlath closed this Mar 21, 2024
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.

4 participants