diff --git a/src/components/SelectionListRadio/BaseSelectionListRadio.js b/src/components/SelectionListRadio/BaseSelectionListRadio.js index f63f6f17468d..be41b0e170fd 100644 --- a/src/components/SelectionListRadio/BaseSelectionListRadio.js +++ b/src/components/SelectionListRadio/BaseSelectionListRadio.js @@ -21,6 +21,7 @@ const propTypes = { }; function BaseSelectionListRadio(props) { + const firstLayoutRef = useRef(true); const listRef = useRef(null); const textInputRef = useRef(null); const focusTimeoutRef = useRef(null); @@ -254,7 +255,13 @@ function BaseSelectionListRadio(props) { maxToRenderPerBatch={5} windowSize={5} viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}} - onLayout={() => scrollToIndex(focusedIndex, false)} + onLayout={() => { + if (!firstLayoutRef.current) { + return; + } + scrollToIndex(focusedIndex, false); + firstLayoutRef.current = false; + }} /> )}