Skip to content

Fix BaseModal #26045

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
hayata-suenaga merged 5 commits into from
Aug 28, 2023
Merged

Fix BaseModal #26045

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a789a8
fix issues with popover
Aug 27, 2023
c1bef45
fix: add onModelHide as a dependency
Aug 27, 2023
fdb5044
fix: remove dependencies
Aug 27, 2023
d486e3f
fix: add empty dependency array
Aug 27, 2023
3744439
fix: remove comment
Aug 28, 2023
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
13 changes: 8 additions & 5 deletions src/components/Modal/BaseModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,18 @@ function BaseModal({
ComposerFocusManager.setReadyToFocus();
}
},
// eslint-disable-next-line react-hooks/exhaustive-deps -- adding onModalHide to the dependency array causes too many unnecessary rerenders
[shouldSetModalVisibility],
[shouldSetModalVisibility, onModalHide, fullscreen],
);

useEffect(() => {
Modal.willAlertModalBecomeVisible(isVisible);

// To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu
Modal.setCloseModal(isVisible ? onClose : null);
}, [isVisible, onClose]);

return () => {
useEffect(
() => () => {
// Only trigger onClose and setModalVisibility if the modal is unmounting while visible.
if (isVisible) {
hideModal(true);
Expand All @@ -90,8 +91,10 @@ function BaseModal({

// To prevent closing any modal already unmounted when this modal still remains as visible state
Modal.setCloseModal(null);
};
}, [hideModal, isVisible, onClose]);
},
// eslint-disable-next-line react-hooks/exhaustive-deps
[],

@dukenv0307 dukenv0307 Apr 1, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref: #58885, we should use hideModalRef instead of hideModal

);

const handleShowModal = () => {
if (shouldSetModalVisibility) {
Expand Down