Make useSearchSelectorBase not filter out selected items in single select mode instead

Author: mhawryluk

src/hooks/useSearchSelector.base.ts

@@ -352,17 +352,18 @@ function useSearchSelectorBase({
             : null,
     };
 
-    const unselectedRecentReports = searchOptions.recentReports.filter((option) => !option.isSelected);
+    const isSingleSelect = selectionMode === CONST.SEARCH_SELECTOR.SELECTION_MODE_SINGLE;
+    const filteredRecentReports = isSingleSelect ? searchOptions.recentReports : searchOptions.recentReports.filter((option) => !option.isSelected);
 
     // Filter out people who appear in recent reports from personal details (recents take priority)
-    const recentReportLogins = new Set(unselectedRecentReports.map((option) => option.login).filter(Boolean));
-    const unselectedPersonalDetails = searchOptions.personalDetails.filter((option) => !option.isSelected && !recentReportLogins.has(option.login));
+    const recentReportLogins = new Set(filteredRecentReports.map((option) => option.login).filter(Boolean));
+    const filteredPersonalDetails = searchOptions.personalDetails.filter((option) => (isSingleSelect || !option.isSelected) && !recentReportLogins.has(option.login));
 
     const availableOptions = {
         ...searchOptions,
-        personalDetails: unselectedPersonalDetails,
-        recentReports: unselectedRecentReports,
-        userToInvite: searchOptions.userToInvite?.isSelected ? null : searchOptions.userToInvite,
+        personalDetails: filteredPersonalDetails,
+        recentReports: filteredRecentReports,
+        userToInvite: !isSingleSelect && searchOptions.userToInvite?.isSelected ? null : searchOptions.userToInvite,
     };
 
     /**

src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx

@@ -33,7 +33,7 @@ function AddDelegatePage() {
             {} as Record<string, boolean>,
         ) ?? {};
 
-    const {searchTerm, debouncedSearchTerm, setSearchTerm, searchOptions, areOptionsInitialized, setSelectedOptions, onListEndReached} = useSearchSelector({
+    const {searchTerm, debouncedSearchTerm, setSearchTerm, availableOptions, areOptionsInitialized, setSelectedOptions, onListEndReached} = useSearchSelector({
         selectionMode: CONST.SEARCH_SELECTOR.SELECTION_MODE_SINGLE,
         searchContext: CONST.SEARCH_SELECTOR.SEARCH_CONTEXT_GENERAL,
         includeUserToInvite: true,
@@ -47,33 +47,30 @@ function AddDelegatePage() {
         Navigation.navigate(ROUTES.SETTINGS_DELEGATE_ROLE.getRoute(option.login ?? ''));
     };
 
-    const recentReportLogins = new Set(searchOptions.recentReports.map((option) => option.login).filter(Boolean));
-    const dedupedPersonalDetails = searchOptions.personalDetails.filter((option) => !recentReportLogins.has(option.login));
-
     const headerMessage = getHeaderMessage(
-        (searchOptions.recentReports?.length || 0) + (dedupedPersonalDetails?.length || 0) !== 0,
-        !!searchOptions.userToInvite,
+        (availableOptions.recentReports?.length || 0) + (availableOptions.personalDetails?.length || 0) !== 0,
+        !!availableOptions.userToInvite,
         debouncedSearchTerm,
         countryCode,
     );
     const sectionsList = [
         {
             title: translate('common.recents'),
             sectionIndex: 0,
-            data: searchOptions.recentReports,
+            data: availableOptions.recentReports,
         },
         {
             title: translate('common.contacts'),
             sectionIndex: 1,
-            data: dedupedPersonalDetails,
+            data: availableOptions.personalDetails,
         },
     ];
 
-    if (searchOptions.userToInvite) {
+    if (availableOptions.userToInvite) {
         sectionsList.push({
             sectionIndex: 2,
             title: '',
-            data: [searchOptions.userToInvite],
+            data: [availableOptions.userToInvite],
         });
     }