From 8cd0f594a09225087b460ddc6883dccd8ac168e1 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 17 May 2021 22:59:51 -0500 Subject: [PATCH] Fix media modal unable to close from image --- app/soapbox/features/ui/components/media_modal.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/ui/components/media_modal.js b/app/soapbox/features/ui/components/media_modal.js index c6d07db6a..e8bdd58de 100644 --- a/app/soapbox/features/ui/components/media_modal.js +++ b/app/soapbox/features/ui/components/media_modal.js @@ -119,9 +119,14 @@ class MediaModal extends ImmutablePureComponent { } } - handleCloserClick = e => { + handleCloserClick = ({ target }) => { + const whitelist = ['zoomable-image']; const activeSlide = document.querySelector('.media-modal .react-swipeable-view-container > div[aria-hidden="false"]'); - if (e.target === activeSlide || !activeSlide.contains(e.target)) { + + const isClickOutside = target === activeSlide || !activeSlide.contains(target); + const isWhitelisted = whitelist.some(w => target.classList.contains(w)); + + if (isClickOutside || isWhitelisted) { this.props.onClose(); } }