Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CP Staging] Fix selection for splits when there is a search term present #44505

Merged
merged 4 commits into from
Jun 26, 2024
Merged

[CP Staging] Fix selection for splits when there is a search term present #44505

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a10676
Fix selection for splits when there is a seatch term present
yuwenmemon Jun 26, 2024
25533d8
Fix types
yuwenmemon Jun 26, 2024
38cb30e
Prettier
yuwenmemon Jun 26, 2024
657ce33
Fix types
yuwenmemon Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ type MoneyRequestParticipantsSelectorProps = {

/** Callback to add participants in MoneyRequestModal */
onParticipantsAdded: (value: Participant[]) => void;

/** Selected participants from MoneyRequestModal with login */
participants?: Participant[];
participants?: Participant[] | typeof CONST.EMPTY_ARRAY;

/** The type of IOU report, i.e. split, request, send, track */
iouType: IOUType;
Expand All @@ -47,7 +48,7 @@ type MoneyRequestParticipantsSelectorProps = {
action: IOUAction;
};

function MoneyRequestParticipantsSelector({participants = [], onFinish, onParticipantsAdded, iouType, iouRequestType, action}: MoneyRequestParticipantsSelectorProps) {
function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onFinish, onParticipantsAdded, iouType, iouRequestType, action}: MoneyRequestParticipantsSelectorProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
Expand Down Expand Up @@ -94,7 +95,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
options.personalDetails,
betas,
'',
participants,
participants as Participant[],
CONST.EXPENSIFY_EMAILS,

// If we are using this component in the "Submit expense" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
Expand Down Expand Up @@ -153,7 +154,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic

const newOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, {
betas,
selectedOptions: participants,
selectedOptions: participants as Participant[],
excludeLogins: CONST.EXPENSIFY_EMAILS,
maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
});
Expand Down Expand Up @@ -378,6 +379,17 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
onFinish,
]);

const onSelectRow = useCallback(
(item: Participant) => {
if (isIOUSplit) {
addParticipantToSelection(item);
return;
}
addSingleParticipant(item);
},
[isIOUSplit, addParticipantToSelection, addSingleParticipant],
);

return (
<SelectionList
onConfirm={handleConfirmSelection}
Expand All @@ -388,7 +400,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
textInputHint={offlineMessage}
onChangeText={setSearchTerm}
shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
onSelectRow={(item) => (isIOUSplit ? addParticipantToSelection(item) : addSingleParticipant(item))}
onSelectRow={onSelectRow}
shouldDebounceRowSelect
footerContent={footerContent}
headerMessage={header}
Expand Down
Loading