Merge pull request #22622 from thiagobrez/refactor/selection_list/che…

…ckbox_list refactor: SelectionList multiple selection
Expensify · Aug 22, 2023 · 1ec5bf4 · 1ec5bf4
2 parents 3112ed0 + d9191ad
commit 1ec5bf4
Show file tree

Hide file tree

Showing 29 changed files with 1,480 additions and 1,058 deletions.
diff --git a/src/components/CountryPicker/CountrySelectorModal.js b/src/components/CountryPicker/CountrySelectorModal.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import CONST from '../../CONST';
 import useLocalize from '../../hooks/useLocalize';
 import HeaderWithBackButton from '../HeaderWithBackButton';
-import SelectionListRadio from '../SelectionListRadio';
+import SelectionList from '../SelectionList';
 import Modal from '../Modal';
 import ScreenWrapper from '../ScreenWrapper';
 import styles from '../../styles/styles';
@@ -73,16 +73,14 @@ function CountrySelectorModal({currentCountry, isVisible, onClose, onCountrySele
                     title={translate('common.country')}
                     onBackButtonPress={onClose}
                 />
-                <SelectionListRadio
+                <SelectionList
                     headerMessage={headerMessage}
                     textInputLabel={translate('common.country')}
                     textInputPlaceholder={translate('countrySelectorModal.placeholderText')}
                     textInputValue={searchValue}
                     sections={[{data: searchResults, indexOffset: 0}]}
                     onSelectRow={onCountrySelected}
                     onChangeText={setSearchValue}
-                    shouldFocusOnSelectRow
-                    shouldHaveOptionSeparator
                     shouldDelayFocus
                     initiallyFocusedOptionKey={currentCountry}
                 />

diff --git a/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js b/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import _ from 'underscore';
 import HeaderWithBackButton from '../../HeaderWithBackButton';
 import CONST from '../../../CONST';
-import SelectionListRadio from '../../SelectionListRadio';
+import SelectionList from '../../SelectionList';
 import Modal from '../../Modal';
-import {radioListItemPropTypes} from '../../SelectionListRadio/selectionListRadioPropTypes';
+import {radioListItemPropTypes} from '../../SelectionList/selectionListPropTypes';
 import useLocalize from '../../../hooks/useLocalize';
 import ScreenWrapper from '../../ScreenWrapper';
 import styles from '../../../styles/styles';
@@ -15,7 +15,7 @@ const propTypes = {
     isVisible: PropTypes.bool.isRequired,
 
     /** The list of years to render */
-    years: PropTypes.arrayOf(PropTypes.shape(radioListItemPropTypes)).isRequired,
+    years: PropTypes.arrayOf(PropTypes.shape(radioListItemPropTypes.item)).isRequired,
 
     /** Currently selected year */
     currentYear: PropTypes.number,
@@ -69,7 +69,7 @@ function YearPickerModal(props) {
                     title={translate('yearPickerPage.year')}
                     onBackButtonPress={props.onClose}
                 />
-                <SelectionListRadio
+                <SelectionList
                     shouldDelayFocus
                     textInputLabel={translate('yearPickerPage.selectYear')}
                     textInputValue={searchText}