Skip to content

[Feat/modal]: 메인페이지 모달 중복 에러 수정 및 페이지 이동 시 모달 닫힘 기능 구현 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shchoon merged 3 commits into from
Jan 27, 2025
Merged

[Feat/modal]: 메인페이지 모달 중복 에러 수정 및 페이지 이동 시 모달 닫힘 기능 구현 #50

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac45d29
Feat: 메인 페이지 모달 중복 개선 & 앞, 뒤로가기 시 모달 닫힘 기능
shchoon Jan 27, 2025
4a90699
Docs: topic data 수정
shchoon Jan 27, 2025
2e174c5
Refactor: modal 조건부 렌더링 수정
shchoon Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/app/components/home/Carousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ import Modal from "../modal/Modal";

import { Book } from "@/types/common";

export default function Carousel({ books }: { books: Book[] }) {
export default function Carousel({
books,
isModal,
}: {
books: Book[];
isModal: boolean;
}) {
const { isOpen, openModalWithData, data } = useModalStore();

return (
Expand Down Expand Up @@ -49,7 +55,7 @@ export default function Carousel({ books }: { books: Book[] }) {
);
})}
</div>
{data && isOpen && <Modal />}
{data && isOpen && isModal && <Modal />}
</section>
);
}
5 changes: 1 addition & 4 deletions src/app/components/modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ export default function Modal() {
const { closeModal, data, isBookMark } = useModalStore();

useEffect(() => {
// const body = document.body as HTMLBodyElement;
// body.classList.add("modal-open");

const handlePopState = () => {
closeModal();
};
Expand All @@ -25,7 +22,7 @@ export default function Modal() {
useScrollLock.enable(); // 스크롤 잠김
return () => {
useScrollLock.disable(); // 스크롤 잠김 해제
// body.classList.remove("modal-open");
closeModal(); // 뒤로가기 or 앞으로가기 시 모달 닫기
};
}, []);

Expand Down
4 changes: 2 additions & 2 deletions src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ export default async function Home() {
<h1 className="text-2xl font-bold">오늘의 주제</h1>
<h3 className="text-xl font-semibold">{topics[randomIndex]}</h3>
</div>
<Carousel books={bookData.topic} />
<Carousel books={bookData.topic} isModal={true} />
<div className="flex items-center gap-7">
<h1 className="text-2xl font-bold">오늘의 작가</h1>
<h3 className="text-xl font-semibold">{authors[randomIndex]}</h3>
</div>
<Carousel books={bookData.author} />
<Carousel books={bookData.author} isModal={false} />
</div>
</main>
);
Expand Down
6 changes: 3 additions & 3 deletions src/data/topics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
const topics = [
"미래",
"심리",
"역사",
"인공지능",
"자기계발",
"동화",
"코딩",
"철학",
"여행",
"건강",
"환경",
"요리",
"신기술",
"잠",
"예술",
"습관",
"건축",
Expand Down
Loading