Fix can't open emoji picker when edit composer is focused by bernhardoj · Pull Request #54858 · Expensify/App

bernhardoj · 2025-01-07T07:13:01Z

Explanation of Change

Fixed Issues

$ #54599
PROPOSAL: #54599 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open a chat
Have at least 2 messages of your own
Start editing one of the messages
Right-click/long-pressed the 2nd message
Press the add emoji button on the context menu
Verify an emoji picker is shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

…e current report action

melvin-bot · 2025-01-07T07:13:06Z

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

DylanDylann · 2025-01-10T05:12:45Z

src/pages/home/report/ReportActionItemMessageEdit.tsx

+                                if (
+                                    relatedTargetId === CONST.COMPOSER.NATIVE_ID ||
+                                    relatedTargetId === CONST.EMOJI_PICKER_BUTTON_NATIVE_ID ||
+                                    EmojiPickerAction.isActive(action.reportActionID)


@bernhardoj Could you please explain this change? Is there any difference here? Thanks

EmojiPickerAction.isEmojiPickerVisible() checks if a emoji picker is visible. EmojiPickerAction.isActive(action.reportActionID) checks if the emoji picker with an ID of action.reportActionID is visible. This way, we only prevent showing the main composer if the emoji picker is shown from the edit composer picker.

@bernhardoj We have an inconsistency between IOS and Android that is caused by this change.

Android and safari IOS and mWeb in Android

Screen.Recording.2025-01-13.at.16.33.04.mov

400670619-eea2a373-6b79-4a38-b67b-c584cf1668b5.mp4

From my viewpoint, both behavior looks fine but we need to make it consistent (at least consistency on native and consistency on mWeb)

Can you explain the inconsistency? The steps performed on the 1st video (android only) is different from the 2nd video (iOS only)

Ahh sorry, I made a wrong video

Ah, I see. From the video, you can see the chat behind the context menu is moving up which indicates the edit composer is blurred when showing the emoji picker and the main composer shows, but then it moves down again because the edit composer is somehow refocused.

I've tried commenting these codes

App/src/pages/home/report/ReportActionItemMessageEdit.tsx

Lines 194 to 203 in 3cf6037

const focus = useCallback((shouldDelay = false, forcedSelectionRange?: Selection) => {

focusComposerWithDelay(textInputRef.current)(shouldDelay, forcedSelectionRange);

}, []);

// Take over focus priority

const setUpComposeFocusManager = useCallback(() => {

ReportActionComposeFocusManager.onComposerFocus(() => {

focus(true, emojiPickerSelectionRef.current ? {...emojiPickerSelectionRef.current} : undefined);

}, true);

}, [focus]);

even commenting the ref

App/src/pages/home/report/ReportActionItemMessageEdit.tsx

Lines 509 to 517 in 3cf6037

ref={(el: TextInput & HTMLTextAreaElement) => {

textInputRef.current = el;

if (typeof forwardedRef === 'function') {

forwardedRef(el);

} else if (forwardedRef) {

// eslint-disable-next-line no-param-reassign

forwardedRef.current = el;

}

}}

but the refocus still happens.

The composer is blurred when the emoji picker is shown because of this code.

App/src/components/Modal/BaseModal.tsx

Lines 75 to 78 in 3cf6037

const saveFocusState = useCallback(() => {

if (shouldEnableNewFocusManagement) {

ComposerFocusManager.saveFocusState(uniqueModalId);

}

saveFocusState blurs the current active input. I have commenting refocusAfterModalFullyClosed too, but still happens. I think it's a RN bug.

@bernhardoj How about your second approach?

Second, we can refocus to the edit composer when the emoji picker from context menu hides, only if it's a small screen.

For that approach, I was thinking that maybe we can use ReportActionComposeFocusManager.focus() and call it here.

App/src/pages/home/report/PureReportActionItem.tsx

Line 469 in 51ffc9c

setIsEmojiPickerActive as () => void,

(isActive) => { setIsEmojiPickerActive(isActive); if (!isActive) ReportActionComposeFocusManager.focus() }

But I think that's like a workaround to hide the real issue. I think it's better to report it as a new issue and find someone to investigate why it happens like that on Android.

@bernhardoj This is an additional bug and it is out of the scope of the original issue. And your solution can't solve this bug completely. So I suggest we should revert this change here and create a new issue to address this additional bug. If you agree, please test again on platforms after reverting

DylanDylann · 2025-01-10T05:16:24Z

@bernhardoj

(another issue) But when we close the emoji picker menu, we can see that the main composer is still hidden even though the edit composer isn't focused anymore. We show the main composer when the edit composer is blurred, but if it's caused by the emoji picker modal, then we ignore it.

I can't reproduce this problem after applying the fix for the original bug

bernhardoj · 2025-01-10T14:42:00Z

Did you test it on web or native? It should happen on native without the EmojiPickerAction.isActive(action.reportActionID) update

DylanDylann · 2025-01-13T09:29:17Z

Ahh I see it

DylanDylann · 2025-01-17T08:08:37Z

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.2025-01-17.at.15.51.33.mov

Android: mWeb Chrome

Screen.Recording.2025-01-17.at.15.07.38.mov

iOS: Native

Screen.Recording.2025-01-17.at.15.54.16.mov

iOS: mWeb Safari

Screen.Recording.2025-01-17.at.15.07.01.mov

MacOS: Chrome / Safari

Screen.Recording.2025-01-17.at.15.06.21.mov

MacOS: Desktop

Screen.Recording.2025-01-17.at.15.08.13.mov

OSBotify · 2025-01-17T09:11:41Z

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

github-actions · 2025-01-17T13:54:50Z

🚀 Deployed to staging by https://github.com/techievivek in version: 9.0.87-0 🚀

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

github-actions · 2025-01-21T08:07:54Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.87-3 🚀

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

bernhardoj added 2 commits January 7, 2025 15:05

fix emoji picker won't show when edit composer is focused

d28091d

only prevent showing the main composer if the emoji picker is from th…

48c8fc3

…e current report action

bernhardoj requested a review from a team as a code owner January 7, 2025 07:13

melvin-bot bot requested review from DylanDylann and removed request for a team January 7, 2025 07:13

prettier

8626fdf

DylanDylann reviewed Jan 10, 2025

View reviewed changes

bernhardoj added 5 commits January 17, 2025 09:58

Merge branch 'main' into fix/54599-can't-open-emoji-picker

64e4168

use the prev behavior

d33dbc7

lint

f680b09

lint

1ce7742

prettier

542d1f4

DylanDylann approved these changes Jan 17, 2025

View reviewed changes

melvin-bot bot requested a review from techievivek January 17, 2025 08:55

techievivek assigned bernhardoj Jan 17, 2025

techievivek approved these changes Jan 17, 2025

View reviewed changes

techievivek merged commit 5a3d556 into Expensify:main Jan 17, 2025

github-actions bot mentioned this pull request Jan 17, 2025

Deploy Checklist: New Expensify 2025-01-17 #55396

Closed

60 tasks

melvin-bot bot mentioned this pull request Jan 21, 2025

[HOLD for payment 2025-01-28] [$250] iOS Chat - Unable to open emoji picker from context menu when editing another message #54599

Closed

8 tasks

	const focus = useCallback((shouldDelay = false, forcedSelectionRange?: Selection) => {
	focusComposerWithDelay(textInputRef.current)(shouldDelay, forcedSelectionRange);
	}, []);

	// Take over focus priority
	const setUpComposeFocusManager = useCallback(() => {
	ReportActionComposeFocusManager.onComposerFocus(() => {
	focus(true, emojiPickerSelectionRef.current ? {...emojiPickerSelectionRef.current} : undefined);
	}, true);
	}, [focus]);

	ref={(el: TextInput & HTMLTextAreaElement) => {
	textInputRef.current = el;
	if (typeof forwardedRef === 'function') {
	forwardedRef(el);
	} else if (forwardedRef) {
	// eslint-disable-next-line no-param-reassign
	forwardedRef.current = el;
	}
	}}

	const saveFocusState = useCallback(() => {
	if (shouldEnableNewFocusManagement) {
	ComposerFocusManager.saveFocusState(uniqueModalId);
	}

Conversation

bernhardoj commented Jan 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 7, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jan 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Jan 10, 2025

Uh oh!

bernhardoj commented Jan 10, 2025

Uh oh!

DylanDylann commented Jan 13, 2025

Uh oh!

DylanDylann commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Jan 17, 2025

Uh oh!

github-actions bot commented Jan 17, 2025

Uh oh!

github-actions bot commented Jan 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bernhardoj commented Jan 7, 2025 •

edited

Loading

DylanDylann Jan 13, 2025 •

edited

Loading

DylanDylann commented Jan 17, 2025 •

edited

Loading