From 15c854a30781198e448e6eeeaa5aa3e031ec04ed Mon Sep 17 00:00:00 2001 From: kimjh2369 Date: Fri, 21 Jun 2024 17:41:34 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=A7=80=EC=A0=95=ED=95=9C=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20=EB=93=A4=EC=96=B4=EC=98=AC=EC=8B=9C=20=EB=8B=AB?= =?UTF-8?q?=ED=9E=88=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/NewFlightApprovalsContainer.js | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/containers/flight/NewFlightApprovalsContainer.js b/src/containers/flight/NewFlightApprovalsContainer.js index a74e390d..2ef97b42 100644 --- a/src/containers/flight/NewFlightApprovalsContainer.js +++ b/src/containers/flight/NewFlightApprovalsContainer.js @@ -131,28 +131,19 @@ export default function NewFlightApprovalsContainer({ mode }) { } if (savedRightMenuRef.current) { - console.log('@?@?@?'); - // 부모 창의 특정 영역 (right-layer)의 위치와 크기 - const specificArea = { - left: window.screenX + window.outerWidth - clientX, // 영역을 넓게 설정 - right: window.screenX + window.outerWidth - clientX - }; - console.log(specificArea); - // 팝업 창의 현재 위치 - const popupRightEdge = popup.screenX + popup.outerWidth; - - // window.screenX + window.outerWidth - e.clientX - console.log(popupRightEdge); - // console.log('Popup Position:', { popupLeft, popupTop }); - if ( - popupRightEdge >= specificArea.left && - popupRightEdge <= specificArea.right - ) { + const popupX = popup.screenX; + + const parentX = window.screenX + savedRightMenuRef.current.left - 70; + + const parentWidth = savedRightMenuRef.current.width; + + if (popupX >= parentX && popupX <= parentX + parentWidth) { + popup.close(); setIsPopup(false); clearInterval(timer); } } - }, 1000); // 1초마다 체크 + }, 500); // 1초마다 체크 } window.addEventListener('message', childMessage); @@ -189,7 +180,7 @@ export default function NewFlightApprovalsContainer({ mode }) { // const popupY = Math.round( // window.screenY + window.outerHeight / 2 - popupHeight / 2 // ); - setClientX(window.screenX + window.outerWidth - e.clientX); + // setClientX(window.screenX + window.outerWidth - e.clientX); const popupX = window.screenX + (window.outerWidth - popupWidth) / 2 +