From 8426a011b056bb9b11bea1666dfad1609d609b0d Mon Sep 17 00:00:00 2001 From: Lim Chee Aun Date: Thu, 26 Oct 2023 02:48:36 +0800 Subject: [PATCH] Also fix esc handling media alt modal in media modal --- src/components/media-modal.jsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/media-modal.jsx b/src/components/media-modal.jsx index 6f3c166e..4b72e66e 100644 --- a/src/components/media-modal.jsx +++ b/src/components/media-modal.jsx @@ -66,9 +66,17 @@ function MediaModal({ }; }, []); - useHotkeys('esc', onClose, [onClose]); - - const [showMediaAlt, setShowMediaAlt] = useState(false); + useHotkeys( + 'esc', + onClose, + { + ignoreEventWhen: (e) => { + const hasModal = !!document.querySelector('#modal-container > *'); + return hasModal; + }, + }, + [onClose], + ); useEffect(() => { let handleScroll = () => {