Fix - Ensure the focus in the chat switcher does not change when the API results get in by FitseTLT · Pull Request #72273 · Expensify/App

FitseTLT · 2025-10-09T20:43:14Z

Explanation of Change

Fixed Issues

$ #71777

PROPOSAL: #71777 (comment)

Tests

Precondition: this should be tested only on Web (mac) and Desktop platforms

CMD+K to open the chat switcher
Type a text that will exactly match with the text of any item (report) and at the same time will have multiple results (at least two results)
While the loading indicator is still loading, hit arrow down to go to the 2nd result
Verify when API request completes (loading indicator disappears) the focus still remains on the 2nd result (does not switch back to the first result).

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

2025-10-09.23-36-15.mp4

MacOS: Desktop

2025-10-09.23-35-58.mp4

… the focus

melvin-bot · 2025-10-09T20:43:20Z

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

codecov · 2025-10-09T20:54:30Z

Codecov Report

❌ Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...rc/components/Search/SearchRouter/SearchRouter.tsx	0.00%	1 Missing ⚠️
...ListWithSections/BaseSelectionListWithSections.tsx	66.66%	1 Missing ⚠️

Files with missing lines	Coverage Δ
...rc/components/Search/SearchRouter/SearchRouter.tsx	`0.41% <0.00%> (ø)`
...ListWithSections/BaseSelectionListWithSections.tsx	`75.11% <66.66%> (-0.13%)`	⬇️

... and 60 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

DylanDylann · 2025-10-10T09:35:00Z

    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, () => {
        onRouterClose();
    });
+    const updateAndScrollToFocusedIndex = useCallback(() => listRef.current?.updateAndScrollToFocusedIndex(1, true), []);


@FitseTLT I think it is unnecessary

Because we are passing a callback directly it changes on every render which will in turn trigger the effect unnecessarily.

DylanDylann · 2025-10-10T09:35:19Z

                    setTextQuery={setTextAndUpdateSelection}
                    updateAutocompleteSubstitutions={updateAutocompleteSubstitutions}
-                    onHighlightFirstItem={() => listRef.current?.updateAndScrollToFocusedIndex(1)}
+                    onHighlightFirstItem={updateAndScrollToFocusedIndex}


Suggested change

onHighlightFirstItem={updateAndScrollToFocusedIndex}

onHighlightFirstItem={() => listRef.current?.updateAndScrollToFocusedIndex(1, true)}

@FitseTLT you can do like this, no need to define updateAndScrollToFocusedIndex

Yeah I think I like this suggestion in that it keeps things as simple as possible, can you edit please @FitseTLT?

a bit confused here @DylanDylann you 👍 my comment above but you are suggesting to revert it. I will explain it again. The effect I am talking about is the one inside SearchAutocompleteList here

App/src/components/Search/SearchAutocompleteList.tsx

Lines 777 to 783 in 8996805

useEffect(() => {

const targetText = autocompleteQueryValue;

if (shouldHighlight(normalizedReferenceText, targetText)) {

onHighlightFirstItem?.();

}

}, [autocompleteQueryValue, onHighlightFirstItem, normalizedReferenceText]);

it has a dependency of onHighlightFirstItem so because we are directly providing the callback it changes whenever SearchRouter rerenders which in turn is running this effect which is unwanted behavior. Ofcourse we can remove the dependency with lint suppresser but is that better than what I have done? 🫤

@FitseTLT I disagree 😞. Since SearchAutocompleteList likely doesn’t use React.memo or any optimization to prevent re-renders when props change, memoizing the callback wouldn’t actually stop unnecessary re-renders of its child components (Read more here). It provides no real benefit. Additionally, the function itself is just a simple wrapper around listRef.current?.updateAndScrollToFocusedIndex(1, true), with no complex logic or heavy computation that would justify memoization.

@DylanDylann If a component doesn't have a memo implemented it is rendered based on the default react principle of prop change and in this case if you don't use useCallback for the callback whenever SearchRouter is rendered the onHighlightFirstItem prop will be a new one because you are directly defining the callback so it forces SearchAutocompleteList to be rendered and also this effect to run

App/src/components/Search/SearchAutocompleteList.tsx

Lines 777 to 783 in 8996805

useEffect(() => {

const targetText = autocompleteQueryValue;

if (shouldHighlight(normalizedReferenceText, targetText)) {

onHighlightFirstItem?.();

}

}, [autocompleteQueryValue, onHighlightFirstItem, normalizedReferenceText]);

Look at the vid below how the effect runs for more than 20 times as opposed to 6 times when using useCallback

2025-10-13.20-57-59.mp4

Regarding the complexity, we already have another useCallback usages for a similar use case with simple complexity here

App/src/components/Search/SearchRouter/SearchRouter.tsx

Lines 296 to 303 in 1d8ab31

const setTextAndUpdateSelection = useCallback(

(text: string) => {

setTextInputValue(text);

shouldScrollRef.current = true;

setSelection({start: text.length, end: text.length});

},

[setSelection, setTextInputValue],

);

DylanDylann · 2025-10-10T09:40:26Z

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-10-10.at.16.38.52.mov

Android: mWeb Chrome

Screen.Recording.2025-10-10.at.16.36.54.mov

iOS: HybridApp

iOS: mWeb Safari

Screen.Recording.2025-10-10.at.16.36.05.mov

MacOS: Chrome / Safari

Screen.Recording.2025-10-10.at.16.32.50.mov

MacOS: Desktop

Screen.Recording.2025-10-10.at.16.34.02.mov

DylanDylann · 2025-10-10T16:10:57Z

NAB: but I left a minor comment: #72273 (comment)

francoisl · 2025-10-13T19:19:20Z

All right I'm going to merge, the comment is a pretty minor thing in the grand scheme of things.

OSBotify · 2025-10-13T19:32:32Z

✋ 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 · 2025-10-13T21:22:18Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.2.30-0 🚀

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

OSBotify · 2025-10-14T17:36:44Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.30-6 🚀

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

avoid updating search router focused index if the user manually moved…

414bc3f

… the focus

FitseTLT requested a review from a team as a code owner October 9, 2025 20:43

melvin-bot Bot assigned FitseTLT Oct 9, 2025

melvin-bot Bot requested a review from DylanDylann October 9, 2025 20:43

melvin-bot Bot removed the request for review from a team October 9, 2025 20:43

DylanDylann reviewed Oct 10, 2025

View reviewed changes

DylanDylann approved these changes Oct 10, 2025

View reviewed changes

melvin-bot Bot requested a review from francoisl October 10, 2025 16:10

Merge branch 'main' into fix-changing-focus-on-api-result-merged

1d8ab31

francoisl approved these changes Oct 13, 2025

View reviewed changes

francoisl merged commit 524232a into Expensify:main Oct 13, 2025
22 checks passed

OSBotify mentioned this pull request Oct 13, 2025

Deploy Checklist: New Expensify 2025-10-13 #72503

Closed

92 tasks

	onHighlightFirstItem={updateAndScrollToFocusedIndex}
	onHighlightFirstItem={() => listRef.current?.updateAndScrollToFocusedIndex(1, true)}

	useEffect(() => {
	const targetText = autocompleteQueryValue;

	if (shouldHighlight(normalizedReferenceText, targetText)) {
	onHighlightFirstItem?.();
	}
	}, [autocompleteQueryValue, onHighlightFirstItem, normalizedReferenceText]);

	const setTextAndUpdateSelection = useCallback(
	(text: string) => {
	setTextInputValue(text);
	shouldScrollRef.current = true;
	setSelection({start: text.length, end: text.length});
	},
	[setSelection, setTextInputValue],
	);

Uh oh!

Conversation

FitseTLT commented Oct 9, 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 Oct 9, 2025

Uh oh!

codecov Bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DylanDylann Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

FitseTLT Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

francoisl Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

FitseTLT Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Oct 11, 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!

FitseTLT Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Oct 10, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann commented Oct 10, 2025

Uh oh!

francoisl commented Oct 13, 2025

Uh oh!

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

FitseTLT commented Oct 9, 2025 •

edited

Loading

codecov Bot commented Oct 9, 2025 •

edited

Loading

DylanDylann Oct 11, 2025 •

edited

Loading