Merge pull request #54994 from daledah/fix/54606

fix: scroll list to the top when adding user
Expensify · Jan 10, 2025 · 8d3f97b · 8d3f97b
2 parents e3044c4 + c3866e6
commit 8d3f97b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
@@ -755,14 +755,11 @@ function BaseSelectionList<TItem extends ListItem>(
         isTextInputFocusedRef.current = isTextInputFocused;
     }, []);
 
-    useImperativeHandle(ref, () => ({scrollAndHighlightItem, clearInputAfterSelect, updateAndScrollToFocusedIndex, updateExternalTextInputFocus, scrollToIndex, getFocusedOption}), [
-        scrollAndHighlightItem,
-        clearInputAfterSelect,
-        updateAndScrollToFocusedIndex,
-        updateExternalTextInputFocus,
-        scrollToIndex,
-        getFocusedOption,
-    ]);
+    useImperativeHandle(
+        ref,
+        () => ({scrollAndHighlightItem, clearInputAfterSelect, updateAndScrollToFocusedIndex, updateExternalTextInputFocus, scrollToIndex, getFocusedOption, focusTextInput}),
+        [scrollAndHighlightItem, clearInputAfterSelect, updateAndScrollToFocusedIndex, updateExternalTextInputFocus, scrollToIndex, getFocusedOption, focusTextInput],
+    );
 
     /** Selects row when pressing Enter */
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ENTER, selectFocusedOption, {

diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
@@ -645,6 +645,7 @@ type SelectionListHandle = {
     updateAndScrollToFocusedIndex: (newFocusedIndex: number) => void;
     updateExternalTextInputFocus: (isTextInputFocused: boolean) => void;
     getFocusedOption: () => ListItem | undefined;
+    focusTextInput: () => void;
 };
 
 type ItemLayout = {

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
@@ -236,6 +236,8 @@ function NewChatPage() {
 
                 selectionListRef?.current?.clearInputAfterSelect?.();
 
+                selectionListRef.current?.focusTextInput();
+                selectionListRef?.current?.scrollToIndex(Math.max(newSelectedOptions.length - 1, 0), true);
                 setSelectedOptions(newSelectedOptions);
             }