Merge branch 'develop' into feat/#86

prgrms-web-devcourse-final-project · Dec 9, 2024 · 06a77ff · 06a77ff
2 parents ec6943c + 41806a2
commit 06a77ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/components/MainModal.jsx b/src/components/MainModal.jsx
@@ -47,12 +47,17 @@ import ThreadRescue from '../pages/ThreadRescue';
 const MainModal = ({ routeName }) => {
     const [currentTabIndex, setTabIndex] = useState(0);
     const currentSlaveIndex = useModalStore((state) => state.slaveIndex);
+    const setSlaveIndex = useModalStore((state) => state.setSlaveIndex);
 
     const modalStatus = useModalStore((state) => state.modalStatus);
     const modalData = useModalStore((state) => state.modalData);
 
     useEffect(() => {
         document.body.classList.add('prevent-scroll');
+
+        return () => {
+            setSlaveIndex(0);
+        };
     }, []);
 
     /**

diff --git a/src/components/common/MainModalCover.jsx b/src/components/common/MainModalCover.jsx
@@ -5,9 +5,8 @@ import SignatureImage from './SignatureImage';
 import tempOptionList from '../../datas/temp-options-list.json'; // 임시 드롭다운 옵션 데이터
 
 const MainModalCover = ({ isPlaceEdit = null }) => {
-    const { modalStatus, modalData, toggleModal, setEditMode } = useModalStore(
-        (state) => state,
-    );
+    const { modalStatus, modalData, toggleModal, setEditMode, setSlaveIndex } =
+        useModalStore((state) => state);
 
     return (
         <section id="main-modal-cover" className={`${modalData.threadType}`}>

diff --git a/src/datas/modalNavObject.json b/src/datas/modalNavObject.json
@@ -108,7 +108,7 @@
             {
                 "label": "댓글",
                 "value": "reply",
-                "count": 0,
+                "count": null,
                 "slaveNavigations": [
                     {
                         "label": "이 장소의 댓글",
@@ -136,7 +136,7 @@
             {
                 "label": "댓글",
                 "value": "reply",
-                "count": 0,
+                "count": null,
                 "slaveNavigations": [
                     {
                         "label": "이 글타래의 댓글",
@@ -169,7 +169,7 @@
             {
                 "label": "댓글",
                 "value": "reply",
-                "count": 0,
+                "count": null,
                 "slaveNavigations": [
                     {
                         "label": "이 글타래의 댓글",