Skip to content

Revert 30972 fix/29780/change implementation of initial focused item #31262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cead22 merged 2 commits into from
Nov 13, 2023
Merged

Revert 30972 fix/29780/change implementation of initial focused item #31262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
575e4a4
Revert "fix: used initialScrollIndex instead of implementing initial …
fedirjh Nov 13, 2023
bf1e4db
Merge branch 'Expensify:main' into revert-30972-fix/29780/change-impl…
fedirjh Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/components/SelectionList/BaseSelectionList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -452,8 +454,7 @@ function BaseSelectionList({
viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
testID="selection-list"
style={[styles.flexGrow0]}
onLayout={handleFirstLayout}
initialScrollIndex={initialFocusedIndex}
onLayout={scrollToFocusedIndexOnFirstRender}
/>
{children}
</>
Expand Down