From 15990350ab81c820dee920e7fe19c5ff51ddc985 Mon Sep 17 00:00:00 2001
From: CheeseB <2489ckckck@naver.com>
Date: Thu, 4 Apr 2024 14:45:46 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=98=88=EC=95=BD=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=EC=B0=BD=20=EB=B0=94=EA=B9=A5=20=ED=81=B4?=
 =?UTF-8?q?=EB=A6=AD=EC=8B=9C=20=EB=8B=AB=ED=9E=88=EA=B2=8C=20=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/calendar/index.tsx             | 46 +++++++++++++------
 .../commons/modals/CustomCommonModal.tsx      | 18 ++++++--
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/components/calendar/index.tsx b/src/components/calendar/index.tsx
index 848f1c02..9485b7ad 100644
--- a/src/components/calendar/index.tsx
+++ b/src/components/calendar/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import classNames from 'classnames/bind';
@@ -47,6 +47,8 @@ const Calendar = ({ gameId }: CalendarProps) => {
   const { multiState, toggleClick } = useMultiState(['scheduleModal', 'confirmModal', 'errorModal']);
   const currentDeviceType = useDeviceType();
 
+  const modalRef = useRef<HTMLDivElement>(null);
+
   const yearString = currentYear.toString();
   const monthString = currentMonth.toString().padStart(2, '0');
 
@@ -75,7 +77,7 @@ const Calendar = ({ gameId }: CalendarProps) => {
         queryKey: QUERY_KEYS.myActivities.getDetailReservationList(gameId, scheduleId!, 'pending'),
       });
     },
-    onError: () => toggleClick('errorModal'),
+    onError: () => handleToggleErrorModal(),
   });
 
   const dropdownOptions = getScheduleDropdownOption(dailySchedules);
@@ -98,7 +100,7 @@ const Calendar = ({ gameId }: CalendarProps) => {
   const handleScheduleClick = (date: string) => {
     setActiveDate(date);
 
-    toggleClick('scheduleModal');
+    handleToggleScheduleModal();
   };
 
   const handleConfirmClick = (scheduleId: number, reservationId: number, status: ReservationStatus) => {
@@ -106,24 +108,24 @@ const Calendar = ({ gameId }: CalendarProps) => {
     setReservationId(reservationId);
     setReservationStatus(status);
 
-    toggleClick('scheduleModal');
-    toggleClick('confirmModal');
+    handleToggleScheduleModal();
+    handleToggleConfirmModal();
   };
 
   const handleChangeReservationStatus = () => {
     changeStatusMutation({ activityId: gameId, reservationId: reservationId!, status: { status: reservationStatus } });
-    toggleClick('confirmModal');
+    handleToggleConfirmModal();
   };
 
-  const handleCloseScheduleModal = () => {
+  const handleToggleScheduleModal = () => {
     toggleClick('scheduleModal');
   };
 
-  const handleCloseConfirmModal = () => {
+  const handleToggleConfirmModal = () => {
     toggleClick('confirmModal');
   };
 
-  const handleCloseErrorModal = () => {
+  const handleToggleErrorModal = () => {
     toggleClick('errorModal');
   };
 
@@ -131,6 +133,19 @@ const Calendar = ({ gameId }: CalendarProps) => {
     if (currentDeviceType !== 'PC') setIsCalendar(false);
   }, [currentDeviceType]);
 
+  useEffect(() => {
+    const listener = (event: MouseEvent) => {
+      if (!modalRef.current || modalRef.current.contains(event.target as Node)) return;
+      handleToggleScheduleModal();
+    };
+
+    document.addEventListener('mousedown', listener);
+
+    return () => {
+      document.removeEventListener('mousedown', listener);
+    };
+  }, [modalRef, handleToggleScheduleModal]);
+
   return (
     <>
       <div className={cx('calendar-container')}>
@@ -155,16 +170,17 @@ const Calendar = ({ gameId }: CalendarProps) => {
         {isSuccess && dropdownOptions.length !== 0 && (
           <CustomCommonModal
             openModal={multiState.scheduleModal}
-            onClose={handleCloseScheduleModal}
+            onClose={handleToggleScheduleModal}
             title={'예약 정보'}
             isCalendar={isCalendar}
+            modalRef={modalRef}
             renderContent={
               <ModalContents
                 gameId={gameId}
                 activeDate={activeDate}
                 dropdownOptions={dropdownOptions}
                 statusCountByScheduleId={statusCountByScheduleId}
-                onClickCloseButton={handleCloseScheduleModal}
+                onClickCloseButton={handleToggleScheduleModal}
                 onClickCardButton={handleConfirmClick}
               />
             }
@@ -174,7 +190,7 @@ const Calendar = ({ gameId }: CalendarProps) => {
       <ConfirmModal
         warning
         openModal={multiState.confirmModal}
-        onClose={handleCloseConfirmModal}
+        onClose={handleToggleConfirmModal}
         state='CONFIRM'
         title={`예약 신청을 ${MY_RESERVATIONS_STATUS[reservationStatus]}하시겠습니까?`}
         desc={`한번 ${MY_RESERVATIONS_STATUS[reservationStatus]}한 예약은 되돌릴 수 없습니다`}
@@ -183,17 +199,17 @@ const Calendar = ({ gameId }: CalendarProps) => {
             <ModalButton variant='warning' onClick={handleChangeReservationStatus}>
               확인
             </ModalButton>
-            <ModalButton onClick={handleCloseConfirmModal}>취소</ModalButton>
+            <ModalButton onClick={handleToggleConfirmModal}>취소</ModalButton>
           </>
         }
       />
       <ConfirmModal
         warning
         openModal={multiState.errorModal}
-        onClose={handleCloseErrorModal}
+        onClose={handleToggleErrorModal}
         state='ERROR'
         title={`예약 ${MY_RESERVATIONS_STATUS[reservationStatus]}에 실패하였습니다.`}
-        renderButton={<ModalButton onClick={handleCloseErrorModal}>닫기</ModalButton>}
+        renderButton={<ModalButton onClick={handleToggleErrorModal}>닫기</ModalButton>}
       ></ConfirmModal>
     </>
   );
diff --git a/src/components/commons/modals/CustomCommonModal.tsx b/src/components/commons/modals/CustomCommonModal.tsx
index 264ce77a..9d9ad76f 100644
--- a/src/components/commons/modals/CustomCommonModal.tsx
+++ b/src/components/commons/modals/CustomCommonModal.tsx
@@ -1,6 +1,6 @@
 import Image from 'next/image';
 
-import { ReactNode, MouseEventHandler, useState, useEffect } from 'react';
+import { ReactNode, MouseEventHandler, useState, useEffect, RefObject } from 'react';
 
 import classNames from 'classnames/bind';
 
@@ -18,9 +18,17 @@ type CustomCommonModalProps = {
   title: string;
   renderContent: ReactNode;
   isCalendar: boolean;
+  modalRef: RefObject<HTMLDivElement>;
 };
 
-export const CustomCommonModal = ({ openModal, onClose, title, renderContent, isCalendar }: CustomCommonModalProps) => {
+export const CustomCommonModal = ({
+  openModal,
+  onClose,
+  title,
+  renderContent,
+  isCalendar,
+  modalRef,
+}: CustomCommonModalProps) => {
   const [isOpen, setIsOpen] = useState(false);
 
   useEffect(() => {
@@ -38,7 +46,11 @@ export const CustomCommonModal = ({ openModal, onClose, title, renderContent, is
   return (
     isOpen && (
       <div className={cx('overlay', { calendar: isCalendar })}>
-        <div className={cx('modal', 'calendar', { open: openModal })} onAnimationEnd={handleAnimationEnd}>
+        <div
+          ref={modalRef}
+          className={cx('modal', 'calendar', { open: openModal })}
+          onAnimationEnd={handleAnimationEnd}
+        >
           <div className={cx('modal-inner')}>
             <header className={cx('modal-header')}>
               <div className={cx('lg-hidden')}>