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

fix: keep the Android keyboard visible when pasting #42622

Merged
merged 14 commits into from
Jun 17, 2024

Conversation

dominictb
Copy link
Contributor

@dominictb dominictb commented May 27, 2024

Details

Fixed Issues

$ #41137
PROPOSAL: #41137 (comment)

Tests

Use mobile browser (iOS chrome, Android chrome, ios safari)

  1. Open any chat page, and start typing in the composer some text (abcd)
  2. Move the cursor to the middle of the text (between letter b and c)
  3. Copy the some other text in Clipboard (should be long enough as we need to test the scrolling behavior after paste as well)
  4. Long press and paste in the Composer

Expected:

  • The value in the composer should be ab<copied text>cd

  • The cursor should be before the letter c instead of moving to the end of the text

  • The keyboard doesn't close during the whole process.

  • 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 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design 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
Android: mWeb Chrome
android-1-8.mp4
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

in Composer component
env: Android Chrome

Signed-off-by: dominictb <[email protected]>
@dominictb dominictb marked this pull request as ready for review May 27, 2024 03:02
@dominictb dominictb requested a review from a team as a code owner May 27, 2024 03:02
@melvin-bot melvin-bot bot removed the request for review from a team May 27, 2024 03:02
Copy link

melvin-bot bot commented May 27, 2024

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

@melvin-bot melvin-bot bot requested a review from dukenv0307 May 27, 2024 03:02
@dukenv0307
Copy link
Contributor

Waiting for Expensify/react-native-live-markdown#357 is merged

@dukenv0307
Copy link
Contributor

Expensify/react-native-live-markdown#357 is merged, pls update this PR as well @dominictb

@dominictb
Copy link
Contributor Author

@dukenv0307 done!

@dukenv0307
Copy link
Contributor

@dominictb Can you update the test steps? Thanks

@dukenv0307
Copy link
Contributor

dukenv0307 commented May 30, 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design 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
Screen.Recording.2024-05-30.at.10.46.15.mov
Android: mWeb Chrome
Screen.Recording.2024-05-30.at.10.31.56.mov
iOS: Native
Screen.Recording.2024-05-30.at.10.44.43.mov
iOS: mWeb Safari
Screen.Recording.2024-05-30.at.10.32.23.mov
MacOS: Chrome / Safari
Screen.Recording.2024-05-30.at.10.28.16.mov
MacOS: Desktop
Screen.Recording.2024-05-30.at.10.36.21.mov

@dominictb
Copy link
Contributor Author

@dukenv0307 updated the test step. Tks!

@dukenv0307
Copy link
Contributor

Code looks good and tests well.

@melvin-bot melvin-bot bot requested a review from mountiny May 31, 2024 02:55
@dukenv0307
Copy link
Contributor

dukenv0307 commented May 31, 2024

@mountiny We should put this PR on hold since there were some errors on rn-live-markdown 0.1.76 and we reverted it in #42766.

@mountiny mountiny changed the title fix: keep the Android keyboard visible when pasting [HOLD live-markdown bump] fix: keep the Android keyboard visible when pasting Jun 4, 2024
@dominictb
Copy link
Contributor Author

Still on hold for now (live-markdown on main is still in 0.1.70)

@dominictb
Copy link
Contributor Author

There's still regression with 0.1.82 bump => Holding

@dominictb dominictb requested a review from dukenv0307 June 9, 2024 20:15
@dominictb
Copy link
Contributor Author

@dukenv0307 requested your review on:

again

Evidence that it fixes all related regression issues and this issue is in this PR: Expensify/react-native-live-markdown#376

@dominictb
Copy link
Contributor Author

@mountiny let's lift this off hold, once Expensify/react-native-live-markdown#376 this is merged and tested then we can move forward with this PR

@dominictb
Copy link
Contributor Author

@dukenv0307 ready for review again!

@dominictb dominictb changed the title [HOLD live-markdown bump] fix: keep the Android keyboard visible when pasting fix: keep the Android keyboard visible when pasting Jun 11, 2024
@dukenv0307
Copy link
Contributor

@dominictb Can you explain why we need to dispatch both focus and focusin

@dominictb
Copy link
Contributor Author

@dukenv0307 I checked once more time:

  • Since the parser in react-native-live-markdown is of the same version as in Expensify/App, we don't have the cursor jumping to the end during paste that you have reported anymore.
  • I also couldn't reproduce the issue mentioned in the code comment saying // Pointer will go out of sight when a large paragraph is pasted on the web. Refocusing the input keeps the cursor in view.. It seems like in the react-native-live-markdown the cursor is automatically scrolled into view during the onChange event.
  • However, to keep things compatible, instead of explicitly call blur(); focus() event causing the keyboard issue, I use dispatchEvent API which will achieve the same thing (trigger the onFocus handler in the RN markdown to restore the cursor position and scroll the cursor into view):
    • dispatchEvent(new FocusEvent('focus')) doesn't trigger the onFocus function
    • dispatchEvent(new FocusEvent('focusin', {bubbles: true})) trigger the onFocus function.
      This seems like the focus behavior of the div[contenteditable=true].

Updated the code to reflect the above explanation

@dukenv0307
Copy link
Contributor

Thanks for your explanation @dominictb. I've re-tested on all platforms and they work well

@dominictb
Copy link
Contributor Author

@mountiny or @johncschuster can you approve this PR? This should be good now. Thanks!

mountiny
mountiny previously approved these changes Jun 14, 2024
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.

@dominictb looks good but please update the comments a bit

src/hooks/useHtmlPaste/index.ts Outdated Show resolved Hide resolved
src/hooks/useHtmlPaste/index.ts Outdated Show resolved Hide resolved
src/hooks/useHtmlPaste/index.ts Outdated Show resolved Hide resolved
@dominictb
Copy link
Contributor Author

@mountiny updated! The PR is ready now!

@dominictb dominictb requested a review from mountiny June 17, 2024 07:54
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!

@mountiny mountiny merged commit beb8e38 into Expensify:main Jun 17, 2024
18 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/mountiny in version: 1.4.85-0 🚀

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

2 similar comments
@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.85-7 🚀

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

@dominictb dominictb deleted the fix/41137 branch July 18, 2024 02:48
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