Merge pull request #37341 from paultsimura/fix/37238-selection-index

fix: Recalculate the sections only on actual change
(cherry picked from commit 8f4a3b8)

src/components/OptionsSelector/BaseOptionsSelector.js

@@ -1,5 +1,6 @@
 import {useIsFocused} from '@react-navigation/native';
 import lodashGet from 'lodash/get';
+import lodashIsEqual from 'lodash/isEqual';
 import PropTypes from 'prop-types';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {ScrollView, View} from 'react-native';
@@ -14,6 +15,7 @@ import ShowMoreButton from '@components/ShowMoreButton';
 import TextInput from '@components/TextInput';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
+import usePrevious from '@hooks/usePrevious';
 import useThemeStyles from '@hooks/useThemeStyles';
 import getPlatform from '@libs/getPlatform';
 import KeyboardShortcut from '@libs/KeyboardShortcut';
@@ -83,7 +85,6 @@ function BaseOptionsSelector(props) {
     const accessibilityRoles = _.values(CONST.ROLE);
 
     const [disabledOptionsIndexes, setDisabledOptionsIndexes] = useState([]);
-    const [sections, setSections] = useState();
     const [shouldDisableRowSelection, setShouldDisableRowSelection] = useState(false);
     const [errorMessage, setErrorMessage] = useState('');
     const [value, setValue] = useState('');
@@ -100,6 +101,7 @@ function BaseOptionsSelector(props) {
     const prevPaginationPage = useRef(paginationPage);
     const prevSelectedOptions = useRef(props.selectedOptions);
     const prevValue = useRef(value);
+    const previousSections = usePrevious(props.sections);
 
     useImperativeHandle(props.forwardedRef, () => textInputRef.current);
 
@@ -134,16 +136,10 @@ function BaseOptionsSelector(props) {
         return calcAllOptions;
     }, [props.sections]);
 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    const initialAllOptions = useMemo(() => flattenSections(), []);
-    const [allOptions, setAllOptions] = useState(initialAllOptions);
-    const [focusedIndex, setFocusedIndex] = useState(getInitiallyFocusedIndex(initialAllOptions));
-    const [focusedOption, setFocusedOption] = useState(allOptions[focusedIndex]);
-
     /**
      * Maps sections to render only allowed count of them per section.
      *
-     * @returns {Objects[]}
+     * @returns {Object[]}
      */
     const sliceSections = useCallback(
         () =>
@@ -162,6 +158,13 @@ function BaseOptionsSelector(props) {
         [paginationPage, props.sections],
     );
 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const initialAllOptions = useMemo(() => flattenSections(), []);
+    const [sections, setSections] = useState(sliceSections());
+    const [allOptions, setAllOptions] = useState(initialAllOptions);
+    const [focusedIndex, setFocusedIndex] = useState(getInitiallyFocusedIndex(initialAllOptions));
+    const [focusedOption, setFocusedOption] = useState(allOptions[focusedIndex]);
+
     /**
      * Completes the follow-up actions after a row is selected
      *
@@ -415,6 +418,10 @@ function BaseOptionsSelector(props) {
     }, [isFocused, props.autoFocus]);
 
     useEffect(() => {
+        if (lodashIsEqual(props.sections, previousSections)) {
+            return;
+        }
+
         const newSections = sliceSections();
         const newOptions = flattenSections();
 
@@ -434,7 +441,7 @@ function BaseOptionsSelector(props) {
         setFocusedIndex(prevFocusedOptionIndex || (_.isNumber(props.focusedIndex) ? props.focusedIndex : newFocusedIndex));
         // we want to run this effect only when the sections change
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.sections]);
+    }, [props.sections, previousSections]);
 
     useEffect(() => {
         // If we just toggled an option on a multi-selection page or cleared the search input, scroll to top