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

Migrate ReportActionCompose to function #18648

Conversation

stas-kravchuk
Copy link
Contributor

@stas-kravchuk stas-kravchuk commented May 9, 2023

Details

Refactoring the ReportActionCompose.js component from class to functional one.

Fixed Issues

$ #16263

Tests

  • Write and send a message
  • Insert emoji from emoji picker in empty input
  • Type some message and try to insert emoji into different places where the cursor is placed (with different selections)
  • Insert emoji with emoji suggestion (with : )
  • Type huge text to test composer size change with different amounts of lines
  • Add/send an attachment
  • Verify that the focus on the text input is being saved after the attachment modal is open, emoji picker is open, the message sending, etc
  • Click on the arrows button to see the composer in expand/collapsed view (full size mode)
  • Add mention, send message with mention

Offline tests

None needed.

QA Steps

Same as in "Tests"

  • 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 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
    • 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 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

web 1

web 2

web 3

Mobile Web - Chrome

android web 1

android web 2

android web 3

Mobile Web - Safari

ios web 1

ios web 2

ios web 3

Desktop

desktop 1

desktop 2

desktop 3

iOS

ios 1

ios 2

ios 3

Android

android 1

android 2

android 3

@github-actions
Copy link
Contributor

github-actions bot commented May 9, 2023

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

</OfflineWithFeedback>
{isDraggingOver && <ReportDropUI />}
{!_.isEmpty(suggestionValues.suggestedEmojis) && suggestionValues.shouldShowEmojiSuggestionMenu && (
<ArrowKeyFocusManager
Copy link
Contributor

Choose a reason for hiding this comment

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

We added a useArrowKeyFocusManager hook, let's use that instead. It's a bit simpler.

@stas-kravchuk stas-kravchuk changed the title [WIP] Migrate ReportActionCompose to function Migrate ReportActionCompose to function Jun 2, 2023
@stas-kravchuk stas-kravchuk marked this pull request as ready for review June 2, 2023 07:49
@stas-kravchuk stas-kravchuk requested a review from a team as a code owner June 2, 2023 07:49
@melvin-bot melvin-bot bot requested review from 0xmiros and removed request for a team June 2, 2023 07:49
@roryabraham
Copy link
Contributor

Can't merge due to unsigned commits

@situchan
Copy link
Contributor

Seems last 2 commits should be reverted and force push with signed commit

Screenshot 2023-08-18 at 12 29 34 AM

cc: @Szymon20000

Szymon Kapała and others added 2 commits August 18, 2023 15:10
@Szymon20000 Szymon20000 force-pushed the @stas-kravchuk/16263-migrate-reportactioncompose-to-function branch from a10c273 to af0ea24 Compare August 18, 2023 13:10
@situchan
Copy link
Contributor

@Szymon20000 please fix conflict. Apply changes from #24512

@mountiny
Copy link
Contributor

@situchan I dont see conflicts on GH

@situchan
Copy link
Contributor

There should be conflict since #24512 was merged

Screenshot 2023-08-18 at 9 01 43 PM

@mountiny
Copy link
Contributor

Oh interesting its not showing the specifc files, I can see it now

@roryabraham roryabraham merged commit 7cbd602 into Expensify:main Aug 18, 2023
@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.

@ginsuma
Copy link
Contributor

ginsuma commented Aug 21, 2023

This hook should be divided into two hooks.

useEffect(() => {
const unsubscribeNavigationBlur = navigation.addListener('blur', () => KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress));
const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);
setUpComposeFocusManager();
});
KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);
setUpComposeFocusManager();
updateComment(commentRef.current);
// Shows Popover Menu on Workspace Chat at first sign-in
if (!disabled) {
Welcome.show({
routes: lodashGet(navigation.getState(), 'routes', []),
showPopoverMenu,
});
}
if (comment.length !== 0) {
Report.setReportWithDraft(reportID, true);
}
return () => {
ReportActionComposeFocusManager.clear();
KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress);
unsubscribeNavigationBlur();
unsubscribeNavigationFocus();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

One hook has focusComposerOnKeyPress as a dependency.

useEffect(() => {
    const unsubscribeNavigationBlur = navigation.addListener('blur', () => KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress));
    const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
        KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);
        setUpComposeFocusManager();
    });
    KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);

    return () => {
        KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress);
        unsubscribeNavigationBlur();
        unsubscribeNavigationFocus();
    };
    // eslint-disable-next-line react-hooks/exhaustive-deps
}, [focusComposerOnKeyPress]);

Because we used useCallback for focusComposerOnKeyPress, so we need to update the listeners whenfocusComposerOnKeyPress changes. Currently, we get a regression:

  1. Open RHP by direct link.
  2. Close RHP.
  3. Blur the main composer.
  4. Press the keys.

Expected result: the main composer focuses and receives the keys.
cc: @stas-kravchuk @situchan @roryabraham

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.56-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

@chrispader
Copy link
Contributor

This hook should be divided into two hooks.

useEffect(() => {
const unsubscribeNavigationBlur = navigation.addListener('blur', () => KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress));
const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);
setUpComposeFocusManager();
});
KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);
setUpComposeFocusManager();
updateComment(commentRef.current);
// Shows Popover Menu on Workspace Chat at first sign-in
if (!disabled) {
Welcome.show({
routes: lodashGet(navigation.getState(), 'routes', []),
showPopoverMenu,
});
}
if (comment.length !== 0) {
Report.setReportWithDraft(reportID, true);
}
return () => {
ReportActionComposeFocusManager.clear();
KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress);
unsubscribeNavigationBlur();
unsubscribeNavigationFocus();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

One hook has focusComposerOnKeyPress as a dependency.

useEffect(() => {
    const unsubscribeNavigationBlur = navigation.addListener('blur', () => KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress));
    const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
        KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);
        setUpComposeFocusManager();
    });
    KeyDownListener.addKeyDownPressListner(focusComposerOnKeyPress);

    return () => {
        KeyDownListener.removeKeyDownPressListner(focusComposerOnKeyPress);
        unsubscribeNavigationBlur();
        unsubscribeNavigationFocus();
    };
    // eslint-disable-next-line react-hooks/exhaustive-deps
}, [focusComposerOnKeyPress]);

Because we used useCallback for focusComposerOnKeyPress, so we need to update the listeners whenfocusComposerOnKeyPress changes. Currently, we get a regression:

  1. Open RHP by direct link.
  2. Close RHP.
  3. Blur the main composer.
  4. Press the keys.

Expected result: the main composer focuses and receives the keys. cc: @stas-kravchuk @situchan @roryabraham

Hey @ginsuma !

This section of code got moved to ComposerWithSuggestions.js here.

What do you mean about needing to split this hook into two? The useEffect has focusComposerOnKeyPress as a dependency, which means the effect will trigger, whenever it changes. navigation and setUpComposeFocusManager are also in the dependency array, as those are used too.

Isn't that what we want here?

@roryabraham
Copy link
Contributor

Not sure – @ginsuma can you please report the problem in #expensify-bugs?

@ginsuma
Copy link
Contributor

ginsuma commented Sep 1, 2023

This is outdated now. The problem was two weeks ago, and we fixed it in ComposerWithSuggestions
cc: @chrispader @roryabraham


const onSelectionChange = useCallback(
(e) => {
LayoutAnimation.configureNext(LayoutAnimation.create(50, LayoutAnimation.Types.easeInEaseOut, LayoutAnimation.Properties.opacity));
Copy link
Member

@parasharrajat parasharrajat Sep 8, 2023

Choose a reason for hiding this comment

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

This can mess with animations. This might have been worked on this PR to solve the emoji picker freeze bug but later on, the same bug popped back. #21540

Copy link
Contributor

Choose a reason for hiding this comment

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

As soon as Reanimated 3.5.0 lands we should start using Reanimated for LayoutAnimations going forward

setIsCommentEmpty(!!newComment.match(/^(\s)*$/));
setValue(newComment);
if (commentValue !== newComment) {
const remainder = ComposerUtils.getCommonSuffixLength(commentRef.current, newComment);
Copy link
Contributor

Choose a reason for hiding this comment

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

Changing this argument to commentRef.current caused an issue with the cursor position when pasting emojis, we reverted this to it's originally intended value commentValue in #28310

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.