Introduce an opt-in shouldKeepSelectedInAvailableOptions prop in useSearchSelector to keep existing behavior in other flows

Author: mhawryluk

src/hooks/useSearchSelector.base.ts

@@ -79,6 +79,9 @@ type UseSearchSelectorConfig = {
 
     /** Whether to allow name-only options */
     shouldAllowNameOnlyOptions?: boolean;
+
+    /** Whether to keep selected options in availableOptions instead of filtering them out */
+    shouldKeepSelectedInAvailableOptions?: boolean;
 };
 
 type ContactState = {
@@ -170,6 +173,7 @@ function useSearchSelectorBase({
     includeSelfDM = false,
     recentAttendees,
     shouldAllowNameOnlyOptions = false,
+    shouldKeepSelectedInAvailableOptions = false,
 }: UseSearchSelectorConfig): UseSearchSelectorReturn {
     const {options: defaultOptions, areOptionsInitialized} = useOptionsList({
         shouldInitialize,
@@ -352,18 +356,17 @@ function useSearchSelectorBase({
             : null,
     };
 
-    const isSingleSelect = selectionMode === CONST.SEARCH_SELECTOR.SELECTION_MODE_SINGLE;
-    const filteredRecentReports = isSingleSelect ? searchOptions.recentReports : searchOptions.recentReports.filter((option) => !option.isSelected);
+    const filteredRecentReports = shouldKeepSelectedInAvailableOptions ? 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(filteredRecentReports.map((option) => option.login).filter(Boolean));
-    const filteredPersonalDetails = searchOptions.personalDetails.filter((option) => (isSingleSelect || !option.isSelected) && !recentReportLogins.has(option.login));
+    const filteredPersonalDetails = searchOptions.personalDetails.filter((option) => (shouldKeepSelectedInAvailableOptions || !option.isSelected) && !recentReportLogins.has(option.login));
 
     const availableOptions = {
         ...searchOptions,
         personalDetails: filteredPersonalDetails,
         recentReports: filteredRecentReports,
-        userToInvite: !isSingleSelect && searchOptions.userToInvite?.isSelected ? null : searchOptions.userToInvite,
+        userToInvite: !shouldKeepSelectedInAvailableOptions && searchOptions.userToInvite?.isSelected ? null : searchOptions.userToInvite,
     };
 
     /**

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

@@ -40,6 +40,7 @@ function AddDelegatePage() {
         excludeLogins: {...CONST.EXPENSIFY_EMAILS_OBJECT, ...existingDelegates},
         includeRecentReports: true,
         maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
+        shouldKeepSelectedInAvailableOptions: true,
     });
 
     const handleSelectRow = (option: OptionData) => {