fix/62703: comoser not focused after selecting emoji by Eskalifer1 · Pull Request #64807 · Expensify/App

Eskalifer1 · 2025-06-24T13:24:20Z

Explanation of Change

Fixed Issues

$#62703
PROPOSAL:#62703 (comment)

Tests

Open the app on mobile web
Navigate to any chat > Send any message
Long press on the message and choose Edit
Tap the emoji picker and select any emoji to insert into the message.
Verify that the composer remains focused after emoji is inserted

Verify that no errors appear in the JS console

Offline tests

Open the app on mobile web
Navigate to any chat > Send any message
Long press on the message and choose Edit
Tap the emoji picker and select any emoji to insert into the message.
Verify that the composer remains focused after emoji is inserted

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Open the app on mobile web
Navigate to any chat > Send any message
Long press on the message and choose Edit
Tap the emoji picker and select any emoji to insert into the message.
Verify that the composer remains focused after emoji is inserted

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-app.mov

Android: mWeb Chrome

android-web.mov

iOS: Native

ios-app.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

desktop.mov

MacOS: Desktop

desktop-mobile.mov

desktop-web.mp4

melvin-bot · 2025-06-24T13:24:26Z

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

eVoloshchak · 2025-06-29T19:33:24Z

     * Hide the emoji picker menu.
     */
    const hideEmojiPicker = (isNavigating?: boolean) => {
+        if (shouldUseNarrowLayout) {


Why do we need a shouldUseNarrowLayout check?

I described in the issue that it is on mobile devices that a modal window is used that returns focus to the button when closed, so on a PC it makes no sense to defocus, since it does not affect this bug and, accordingly, it makes no sense to call an extra function that will affect the speed of code execution

so on a PC it makes no sense to defocus,

I agree with this, however, we can make shouldUseNarrowLayout=true on Desktop too by resizing the window. It also works the other way, as shouldUseNarrowLayout can be false on a full-size iPad or an Android tablet. I believe it's better if we remove this check (but we gotta verify it works as expected on all the platforms)

Does it matter which platform we use in this case?

We have the same logic on all platforms, that with shouldUseNarrowLayout=true a modal window of a different type is displayed, so you can also do resize on a PC and also catch this bug

This bug is precisely that the modal window is of a different type under this condition, I described it all in the issue, I will not repeat it here, if possible)

сс: @eVoloshchak

2025-07-02.22.50.16.mov

Of course, I don't really understand what we are talking about, but if we use an iPad that has an extension of more than 800px, then a modal window of a different type will be rendered, and there will be no bug, because in my opinion it does not depend on the platform, but depends on the width of the screen and this bug is only with shouldUseNarrowLayout=true.

Perhaps I did not understand the question very well, so if the answer does not suit you, then please clarify it)

If you say that this function should be used for everything, then I can do it, but I don't really see the point

eVoloshchak · 2025-07-02T20:16:45Z

if we use an iPad that has an extension of more than 800px, then a modal window of a different type will be rendered, and there will be no bug,

Ah, you're right.

it does not depend on the platform, but depends on the width of the screen and this bug is only with shouldUseNarrowLayout=true.

True, but it is not caused by shouldUseNarrowLayout being true, it is caused by a specific behaviour of a modal we render when shouldUseNarrowLayout is true. But that may change in the future; we might use a different type of modal, we might use a different library for modals, etc, so it's not necessarily tied to shouldUseNarrowLayout prop.

If you say that this function should be used for everything, then I can do it, but I don't really see the point

Yeah, I think we should use it everywhere. It is more future-proof and cleaner, as long as it works as expected on Desktop web/ Desktop MacOS

Eskalifer1 · 2025-07-02T20:19:27Z

Okay, i will remove this condition, PR will be updated by tomorrow morning, tomorrow morning you will be able to check

Eskalifer1 · 2025-07-02T22:02:47Z

PR is updated

cc: @eVoloshchak

eVoloshchak · 2025-07-03T15:43:36Z

Tests
Same as in issue

@Eskalifer1, please fill out the Tests and QA Tests sections (they're going to be identical, but it's important both of them are populated, as QA only see the QA Tests section)

Eskalifer1 · 2025-07-03T15:48:16Z

My bad, didnt notice that. Already updated

cc: @eVoloshchak

Eskalifer1 · 2025-07-03T16:14:44Z

@eVoloshchak Conflict is fixed, but we still get errors from test, as i can see this issues for that already created.

So do we need ust to wait when they will be fixed?

Eskalifer1 · 2025-07-03T18:27:03Z

PR is updated

cc: @eVoloshchak

Eskalifer1 · 2025-07-07T09:22:45Z

@eVoloshchak Updated PR, again)

I would be grateful if it could be merged so that there would be no conflicts with the main one again)

eVoloshchak · 2025-07-07T10:43:23Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

Screen.Recording.2025-07-07.at.13.00.30.mov

Android: mWeb Chrome

Screen.Recording.2025-07-07.at.12.58.05.mov

iOS: HybridApp

Screen.Recording.2025-07-07.at.13.01.07.mov

iOS: mWeb Safari

Screen.Recording.2025-07-07.at.13.02.04.mov

MacOS: Chrome / Safari

Screen.Recording.2025-07-07.at.13.03.00.mov

MacOS: Desktop

Screen.Recording.2025-07-07.at.13.04.33.mov

eVoloshchak · 2025-07-07T11:07:24Z

@Eskalifer1, the last step in all of the tests should be

Verify that the composer remains focused after emoji is inserted

eVoloshchak

LGTM!
The tests need to be changed (#64807 (comment))

Eskalifer1 · 2025-07-07T11:55:55Z

Sorry, my bad.

Steps section is updated

OSBotify · 2025-07-08T02:31:01Z

✋ 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-07-08T21:34:15Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.1.78-0 🚀

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

github-actions · 2025-07-10T06:52:56Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.78-4 🚀

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

fix/62703: comoser not focused after selecting emoji

df22cf0

Eskalifer1 requested a review from a team as a code owner June 24, 2025 13:24

melvin-bot Bot requested review from eVoloshchak and removed request for a team June 24, 2025 13:24

Eskalifer1 mentioned this pull request Jun 24, 2025

[Due for payment 2025-07-23] [Due for payment 2025-07-18] [Due for payment 2025-07-17] [$250] mWeb- Composer loses focus after emoji is added during message edit #62703

Closed

8 tasks

eVoloshchak reviewed Jun 29, 2025

View reviewed changes

fix:62703: removed condition for shouldUseNarrowLayout

6d91467

bernhardoj mentioned this pull request Jul 3, 2025

Fix composer is not refocused after adding an emoji in edit composer #65229

Merged

51 tasks

Merge branch 'main' into fix/62703

354008b

Merge remote-tracking branch 'origin' into fix/62703

8f7f50d

Merge branch 'main' into fix/62703

50f7a85

eVoloshchak approved these changes Jul 7, 2025

View reviewed changes

melvin-bot Bot requested a review from marcaaron July 7, 2025 11:11

marcaaron approved these changes Jul 8, 2025

View reviewed changes

marcaaron merged commit 30d781e into Expensify:main Jul 8, 2025
20 checks passed

github-actions Bot mentioned this pull request Jul 8, 2025

Deploy Checklist: New Expensify 2025-07-08 #65687

Closed

59 tasks

This was referenced Jul 9, 2025

Chat - Composer is not auto-focused when starting a new chat #65728

Closed

revert branch fix:62703 #65757

Closed

[CP Staging] Revert "fix/62703: comoser not focused after selecting emoji" #65758

Merged

Uh oh!

Conversation

Eskalifer1 commented Jun 24, 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 Jun 24, 2025

Uh oh!

eVoloshchak Jun 29, 2025

Choose a reason for hiding this comment

Uh oh!

Eskalifer1 Jun 29, 2025

Choose a reason for hiding this comment

Uh oh!

eVoloshchak Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Eskalifer1 Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Eskalifer1 Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Jul 2, 2025

Uh oh!

Eskalifer1 commented Jul 2, 2025

Uh oh!

Eskalifer1 commented Jul 2, 2025

Uh oh!

eVoloshchak commented Jul 3, 2025

Uh oh!

Eskalifer1 commented Jul 3, 2025

Uh oh!

Eskalifer1 commented Jul 3, 2025

Uh oh!

Eskalifer1 commented Jul 3, 2025

Uh oh!

Eskalifer1 commented Jul 7, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak commented Jul 7, 2025

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

Eskalifer1 commented Jul 7, 2025

Uh oh!

Uh oh!

OSBotify commented Jul 8, 2025

Uh oh!

github-actions Bot commented Jul 8, 2025

Uh oh!

github-actions Bot commented Jul 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Eskalifer1 commented Jun 24, 2025 •

edited

Loading

eVoloshchak commented Jul 7, 2025 •

edited

Loading