Merge pull request #31262 from fedirjh/revert-30972-fix/29780/change-…

…implementation-of-initial-focused-item
Expensify · Nov 13, 2023 · 2bf29e5 · 2bf29e5
2 parents 744a7e0 + bf1e4db
commit 2bf29e5
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/components/SelectionList/BaseSelectionList.js b/src/components/SelectionList/BaseSelectionList.js
@@ -144,9 +144,6 @@ 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));
-    // initialFocusedIndex is needed only on component did mount event, don't need to update value
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    const initialFocusedIndex = useMemo(() => (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);
@@ -310,9 +307,14 @@ function BaseSelectionList({
             />
         );
     };
-    const handleFirstLayout = useCallback(() => {
+
+    const scrollToFocusedIndexOnFirstRender = useCallback(() => {
+        if (!firstLayoutRef.current) {
+            return;
+        }
+        scrollToIndex(focusedIndex, false);
         firstLayoutRef.current = false;
-    }, []);
+    }, [focusedIndex, scrollToIndex]);
 
     const updateAndScrollToFocusedIndex = useCallback(
         (newFocusedIndex) => {
@@ -452,8 +454,7 @@ function BaseSelectionList({
                                     viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
                                     testID="selection-list"
                                     style={[styles.flexGrow0]}
-                                    onLayout={handleFirstLayout}
-                                    initialScrollIndex={initialFocusedIndex}
+                                    onLayout={scrollToFocusedIndexOnFirstRender}
                                 />
                                 {children}
                             </>