Skip to content

fix: fix escape shortcut for closing of popovers #18982

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
techievivek merged 3 commits into from
May 16, 2023
Merged

fix: fix escape shortcut for closing of popovers #18982

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
388691d
fix: fix escape shortcut for closing of popovers
allroundexperts May 15, 2023
460cf29
Update src/components/Modal/BaseModal.js
allroundexperts May 15, 2023
f14f57e
Merge branch 'main' into fix-18558
allroundexperts May 16, 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
6 changes: 6 additions & 0 deletions src/components/Modal/BaseModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class BaseModal extends PureComponent {
return;
}

Modal.willAlertModalBecomeVisible(true);
Comment thread
allroundexperts marked this conversation as resolved.

// To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu
Modal.setCloseModal(this.props.onClose);
}
Expand All @@ -52,6 +54,10 @@ class BaseModal extends PureComponent {
// we don't want to call the onModalHide on unmount
this.hideModal(this.props.isVisible);

if (this.props.isVisible) {
Modal.willAlertModalBecomeVisible(false);
}

// To prevent closing any modal already unmounted when this modal still remains as visible state
Modal.setCloseModal(null);
}
Expand Down