Fix scroll behavior when single item is selected

src/components/SelectionList/BaseSelectionList.js

@@ -66,6 +66,7 @@ function BaseSelectionList({
     shouldShowTooltips = true,
     shouldUseDynamicMaxToRenderPerBatch = false,
     rightHandSideComponent,
+    shouldScrollToTopOnSelect = true,
 }) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -372,8 +373,13 @@ function BaseSelectionList({
             return;
         }
 
+        // scroll is unnecessary if multiple options cannot be selected
+        if (!canSelectMultiple) {
+            return;
+        }
+
         // set the focus on the first item when the sections list is changed
-        if (sections.length > 0) {
+        if (sections.length > 0 && shouldScrollToTopOnSelect) {
             updateAndScrollToFocusedIndex(0);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps

src/components/SelectionList/selectionListPropTypes.js

@@ -198,6 +198,9 @@ const propTypes = {
 
     /** Right hand side component to display in the list item. Function has list item passed as the param */
     rightHandSideComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
+
+    /** Whether to scroll to top when an option is selected */
+    shouldScrollToTopOnSelect: PropTypes.bool,
 };
 
 export {propTypes, baseListItemPropTypes, radioListItemPropTypes, userListItemPropTypes};