Skip to content

Commit 8ed66be

Browse files
committed
SD-102: Fix ESC key handling to only close top modal
1 parent f4544e5 commit 8ed66be

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/domains/misc/components/Modal/Modal.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,14 @@ const Modal = ({
5858

5959
useEffect(() => {
6060
const handleEsc = (e: KeyboardEvent) => {
61-
if (e.key === 'Escape' && !nonDismissible) {
61+
// Only handle ESC key if this is the top modal and it's not non-dismissible
62+
if (e.key === 'Escape' && !nonDismissible && isTopModal) {
6263
triggerClose();
6364
}
6465
};
6566
document.addEventListener('keydown', handleEsc);
6667
return () => void document.removeEventListener('keydown', handleEsc);
67-
}, [nonDismissible, triggerClose]);
68+
}, [nonDismissible, triggerClose, isTopModal]);
6869

6970
const pages = Array.isArray(config) ? config : [config];
7071

0 commit comments

Comments
 (0)