diff --git a/src/common/ModalDialog/ModalDialog.js b/src/common/ModalDialog/ModalDialog.js index affe7dd35..0ec3360ef 100644 --- a/src/common/ModalDialog/ModalDialog.js +++ b/src/common/ModalDialog/ModalDialog.js @@ -34,18 +34,9 @@ const ModalDialog = ({ className, title, buttons, children, dataset, onCloseRequ event.nativeEvent.closeModalDialogPrevented = true; }, []); React.useEffect(() => { - const onWindowResize = (event) => { - if (typeof onCloseRequest === 'function') { - onCloseRequest({ - type: 'close', - dataset: dataset, - nativeEvent: event - }); - } - }; const onWindowKeyDown = (event) => { // its `-2` because focus lock render locking divs around its content - if (modalsContainer.childNodes[modalsContainer.childElementCount - 2] === modalContainerRef.current) { + if (event.key === 'Escape' && modalsContainer.childNodes[modalsContainer.childElementCount - 2] === modalContainerRef.current) { if (typeof onCloseRequest === 'function') { onCloseRequest({ type: 'close', @@ -55,10 +46,8 @@ const ModalDialog = ({ className, title, buttons, children, dataset, onCloseRequ } } }; - window.addEventListener('resize', onWindowResize); window.addEventListener('keydown', onWindowKeyDown); return () => { - window.removeEventListener('resize', onWindowResize); window.removeEventListener('keydown', onWindowKeyDown); }; }, [dataset, onCloseRequest]);