fix: used initialScrollIndex instead of implementing initial focus ma…

…nually
Expensify · Nov 7, 2023 · efd8532 · efd8532
1 parent da2c79e
commit efd8532
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/components/SelectionList/BaseSelectionList.js b/src/components/SelectionList/BaseSelectionList.js
@@ -144,6 +144,7 @@ function BaseSelectionList({
 
     // If `initiallyFocusedOptionKey` is not passed, we fall back to `-1`, to avoid showing the highlight on the first member
     const [focusedIndex, setFocusedIndex] = useState(() => _.findIndex(flattenedSections.allOptions, (option) => option.keyForList === initiallyFocusedOptionKey));
+    const initialFocusedIndex = focusedIndex > -1 ? focusedIndex : undefined;
 
     // Disable `Enter` shortcut if the active element is a button or checkbox
     const disableEnterShortcut = activeElement && [CONST.ACCESSIBILITY_ROLE.BUTTON, CONST.ACCESSIBILITY_ROLE.CHECKBOX].includes(activeElement.role);
@@ -307,14 +308,9 @@ function BaseSelectionList({
             />
         );
     };
-
-    const scrollToFocusedIndexOnFirstRender = useCallback(() => {
-        if (!firstLayoutRef.current) {
-            return;
-        }
-        scrollToIndex(focusedIndex, false);
+    const handleFirstLayout = useCallback(() => {
         firstLayoutRef.current = false;
-    }, [focusedIndex, scrollToIndex]);
+    }, []);
 
     const updateAndScrollToFocusedIndex = useCallback(
         (newFocusedIndex) => {
@@ -454,7 +450,8 @@ function BaseSelectionList({
                                     viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
                                     testID="selection-list"
                                     style={[styles.flexGrow0]}
-                                    onLayout={scrollToFocusedIndexOnFirstRender}
+                                    onLayout={handleFirstLayout}
+                                    initialScrollIndex={initialFocusedIndex}
                                 />
                                 {children}
                             </>