Skip to content

[CP Staging] Add shouldCallDirectly for closeModal logic #53873

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

Merged
Beamanator merged 2 commits into from
Dec 10, 2024
Merged

[CP Staging] Add shouldCallDirectly for closeModal logic #53873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e367196
Add shouldCallDirectly for closeModal logic
huult Dec 10, 2024
04dec5f
Add comment to explain shouldCallDirectly
huult Dec 10, 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
29 changes: 20 additions & 9 deletions src/components/AttachmentModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,28 @@ function AttachmentModal({
);

/**
* close the modal
* Closes the modal.
* @param {boolean} [shouldCallDirectly] If true, directly calls `onModalClose`.
* This is useful when you plan to continue navigating to another page after closing the modal, to avoid freezing the app due to navigating to another page first and dismissing the modal later.
* If `shouldCallDirectly` is false or undefined, it calls `attachmentModalHandler.handleModalClose` to close the modal.
* This ensures smooth modal closing behavior without causing delays in closing.
*/
const closeModal = useCallback(() => {
setIsModalOpen(false);
const closeModal = useCallback(
(shouldCallDirectly?: boolean) => {
setIsModalOpen(false);

if (typeof onModalClose === 'function') {
attachmentModalHandler.handleModalClose(onModalClose);
}
if (typeof onModalClose === 'function') {
if (shouldCallDirectly) {
onModalClose();
return;
}
attachmentModalHandler.handleModalClose(onModalClose);
}

// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [onModalClose]);
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
},
[onModalClose],
);

/**
* open the modal
Expand Down Expand Up @@ -419,7 +430,7 @@ function AttachmentModal({
icon: Expensicons.Camera,
text: translate('common.replace'),
onSelected: () => {
closeModal();
closeModal(true);
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
CONST.IOU.ACTION.EDIT,
Expand Down