Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 5 deletions src/components/common/Modal/SeatModal/SeatFocusModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useEffect, useRef } from 'react';
import { CloseIcon } from '@/assets';
import { useModalStore } from '@/store/modalStore';
import SeatMap from '@/components/seat/SeatMap';
import ScreenBar from '@/components/seat/ScreenBar';
import { getSeatLabel } from '@/utils/getSeatLabel';
Expand All @@ -9,15 +8,16 @@ interface SeatFocusModalProps {
auditoriumId: string;
theaterName: string;
selectedSeatNumbers: string[];
focusedSeatIds: string[];
onClose: () => void;
}

const SeatFocusModal = ({
auditoriumId,
theaterName,
selectedSeatNumbers,
onClose,
}: SeatFocusModalProps) => {
const { closeModal } = useModalStore();

const containerRef = useRef<HTMLDivElement>(null);
const innerRef = useRef<HTMLDivElement>(null);

Expand All @@ -44,15 +44,15 @@ const SeatFocusModal = ({

return (
<div className="fixed inset-0 z-50">
<div className="absolute inset-0 bg-gray-800/20" onClick={closeModal} />
<div className="absolute inset-0 bg-gray-800/20" onClick={onClose} />

{/* 모달 */}
<div className="relative z-10 flex h-full items-center justify-center p-3">
<div className="relative w-full max-w-md rounded-lg bg-gray-950 px-2 py-3 md:max-h-3/4 md:max-w-2xl lg:max-h-4/5 lg:max-w-5xl">
{/* 헤더 */}
<div className="mb-1 flex items-center justify-between px-2">
<div className="text-title-3">{selectedSeatNumbers.join(', ')}</div>
<CloseIcon className="cursor-pointer" onClick={closeModal} />
<CloseIcon className="cursor-pointer" onClick={onClose} />
</div>

<div className="text-body-2 btn-text-gray-500 mb-4 px-2 text-left">{theaterName}</div>
Expand Down
11 changes: 10 additions & 1 deletion src/components/common/Modal/SeatModal/SeatModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,27 @@ interface SeatModalProps {
type: SeatModalType;
auditoriumId: string;
theaterName?: string;
focusedSeatIds: string[];
theaterType?: CinemaFormat; // IMAX / DOLBY
selectedSeatNumbers?: string[]; // seatFocus에서만 사용
}

const SeatModal = ({ type, auditoriumId, theaterName, selectedSeatNumbers }: SeatModalProps) => {
const SeatModal = ({
type,
auditoriumId,
theaterName,
selectedSeatNumbers,
focusedSeatIds,
}: SeatModalProps) => {
switch (type) {
case 'seatFocus':
return (
<SeatFocusModal
onClose={() => useModalStore.getState().closeModal()}
auditoriumId={auditoriumId}
theaterName={theaterName ?? ''}
selectedSeatNumbers={selectedSeatNumbers ?? []}
focusedSeatIds={focusedSeatIds}
/>
);
case 'seatPicker':
Expand Down
35 changes: 30 additions & 5 deletions src/components/seat/SeatMap.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import SeatRow from './SeatRow';
import type { SeatRatingInfo } from '@/api/theater/theater.api';
import type { Seat } from '@/types/seat';
import { useRef } from 'react';
import { getSeatLayout } from '@/api/theater/theater.api';
import { useEffect, useRef, useState } from 'react';
import type { ApiError } from '@/types/api-response';

interface SeatMapProps {
auditoriumId?: string;
Expand All @@ -13,27 +15,50 @@ interface SeatMapProps {
}

const SeatMap = ({
auditoriumId,
onSeatClick,
focusedSeatIds = [],
selectedSeatNames = [],
type = 'seatPicker',
seatData = [],
}: SeatMapProps) => {
const seatRows: Record<string, Seat[]> = {};
const [autoSeatData, setAutoSeatData] = useState<Seat[]>([]);
const focusedRef = useRef<HTMLDivElement>(null!);

// row별로 묶기
seatData.forEach((seat) => {
useEffect(() => {
const fetch = async () => {
if (type === 'seatFocus' && auditoriumId) {
try {
const data = await getSeatLayout(auditoriumId);
const parsedData: Seat[] = data.map((seat) => ({
...seat,
column: Number(seat.column),
}));

setAutoSeatData(parsedData);
} catch (error) {
const apiError = error as ApiError;
console.error('좌석 정보 로딩 실패', apiError.error, apiError.message);
}
}
};
fetch();
}, [type, auditoriumId]);

const dataToRender = type === 'seatFocus' ? autoSeatData : seatData;

const seatRows: Record<string, Seat[]> = {};
dataToRender.forEach((seat) => {
if (!seatRows[seat.row]) seatRows[seat.row] = [];
seatRows[seat.row].push(seat);
});

return (
<div className="flex flex-col gap-1">
{Object.entries(seatRows)
.sort(([a], [b]) => a.localeCompare(b)) // row 정렬: A, B, C...
.sort(([a], [b]) => a.localeCompare(b))
.map(([row, seats]) => {
// column 정렬
seats.sort((a, b) => a.column - b.column);

const min = seats[0].column;
Expand Down
39 changes: 38 additions & 1 deletion src/pages/home/ReviewDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
ProfileImageWithFallback,
ConfirmModal,
Loading,
SeatFocusModal,
} from '@/components';
import { Swiper, SwiperSlide } from 'swiper/react';
import { Pagination } from 'swiper/modules';
Expand All @@ -19,6 +20,8 @@ import { cn } from '@/utils/cn';
import { useModalStore, useReviewStore, useToastStore } from '@/store';
import ActionModal from '@/components/common/Modal/ActionModal';
import { deleteReview } from '@/api/review/reviewDelete.api';
import { ChevronRightIcon } from '@/assets';
import { getSeatLayout } from '@/api/theater/theater.api';

const ReviewDetailPage = () => {
const navigate = useNavigate();
Expand All @@ -30,10 +33,11 @@ const ReviewDetailPage = () => {
const { openModal, modalType } = useModalStore();
const [isConfirmOpen, setIsConfirmOpen] = useState(false);
const { setEditMode, setEditReview } = useReviewStore();

const [isSeatFocusOpen, setIsSeatFocusOpen] = useState(false);
//사진 슬라이드 시 현재 사진 위치...
const [currentIndex, setCurrentIndex] = useState(0);
const [isScrolledPastImage, setIsScrolledPastImage] = useState(false);
const [focusedSeatIds, setFocusedSeatIds] = useState<string[]>([]);
useEffect(() => {
if (!review || !review.imageInfo || review.imageInfo.length === 0) return;

Expand Down Expand Up @@ -61,6 +65,25 @@ const ReviewDetailPage = () => {
}
};

const handleSeatFocus = async () => {
if (!review || !review.auditoriumId) return;

try {
const layout = await getSeatLayout(review.auditoriumId);

const targetSeatIds = layout
.filter((s) =>
review.seatInfo.map((seat) => seat.seatNumber).includes(`${s.row}${s.column}`),
)
.map((s) => s.seatId);

setFocusedSeatIds(targetSeatIds);
setIsSeatFocusOpen(true);
} catch (err) {
console.error('좌석 포커스 모달 에러:', err);
}
};

useEffect(() => {
if (!reviewId) return;
const fetchReview = async () => {
Expand Down Expand Up @@ -175,6 +198,11 @@ const ReviewDetailPage = () => {
<span className="text-caption-2 text-white">
{review.seatInfo.map((seat) => seat.seatNumber).join(', ')}
</span>
<span>
<button className="mt-[7px]" onClick={handleSeatFocus}>
<ChevronRightIcon className="w-4" />
</button>
</span>
</div>
</div>

Expand Down Expand Up @@ -262,6 +290,15 @@ const ReviewDetailPage = () => {
}}
/>
)}
{isSeatFocusOpen && (
<SeatFocusModal
onClose={() => setIsSeatFocusOpen(false)}
auditoriumId={review.auditoriumId}
theaterName={review.auditoriumName}
focusedSeatIds={focusedSeatIds}
selectedSeatNumbers={review.seatInfo.map((s) => s.seatNumber)}
/>
)}
</>
);
};
Expand Down
71 changes: 5 additions & 66 deletions src/pages/review/CinemaSelect.tsx
Original file line number Diff line number Diff line change
@@ -1,85 +1,25 @@
import { useNavigate } from 'react-router-dom';
import { ToggleTab, ReviewStepLayout, TheaterList } from '@/components';
import { useState, useEffect, useRef, useCallback } from 'react';
import { useState, useEffect } from 'react';
import { useReviewStore } from '@/store';
import { getTheaters } from '@/api/theater/theater.api';
import { useTheatersQuery } from '@/hooks/queries/useTheatersQuery';
import type { CinemaFormat } from '@/types/onboarding';
import type { Theater } from '@/types/theater';

export default function CinemaSelect() {
const { isInitialized } = useReviewStore();
const navigate = useNavigate();

const [selectedTab, setSelectedTab] = useState<CinemaFormat>('IMAX');
const [selectedAuditorium, setSelectedAuditorium] = useState<string | null>(null);
const [theaters, setTheaters] = useState<Theater[]>([]);
const [page, setPage] = useState(1);
const [hasNext, setHasNext] = useState(true);
const [isLoading, setIsLoading] = useState(false);

const observerRef = useRef<HTMLDivElement | null>(null);
const { data: theaters } = useTheatersQuery({ type: selectedTab, page: 1, size: 10 });

useEffect(() => {
if (!isInitialized) {
navigate('/review');
}
}, [isInitialized, navigate]);

const loadMore = useCallback(async () => {
if (isLoading || !hasNext) return;

setIsLoading(true);
try {
const res = await getTheaters({ type: selectedTab, page, size: 10 });
setTheaters((prev) => [...prev, ...res.content]);
setHasNext(res.hasNext);
setPage((prev) => prev + 1);
} catch (err) {
console.error('영화관 목록 로딩 실패:', err);
} finally {
setIsLoading(false);
}
}, [isLoading, hasNext, page, selectedTab]);

useEffect(() => {
const observer = new IntersectionObserver(
([entry]) => {
if (entry.isIntersecting && !isLoading && hasNext) {
loadMore();
}
},
{
rootMargin: '100px',
threshold: 0.7,
},
);

if (observerRef.current) observer.observe(observerRef.current);

return () => {
if (observerRef.current) observer.unobserve(observerRef.current);
};
}, [loadMore, isLoading, hasNext]);

// 탭 변경 시 초기화
useEffect(() => {
const reset = async () => {
setPage(1);
setTheaters([]);
setHasNext(true);
try {
const res = await getTheaters({ type: selectedTab, page: 1, size: 10 });
setTheaters(res.content);
setHasNext(res.hasNext);
setPage(2);
} catch (err) {
console.error('초기 로딩 실패:', err);
}
};

reset();
}, [selectedTab]);

const handleTabChange = (tab: string) => {
setSelectedTab(tab as CinemaFormat);
setSelectedAuditorium(null);
Expand Down Expand Up @@ -108,7 +48,7 @@ export default function CinemaSelect() {
<ToggleTab
options={[
{ label: 'IMAX', value: 'IMAX' },
{ label: 'Dolby Cinema', value: 'Dolby Cinema' },
{ label: 'Dolby Cinema', value: 'Dolby' },
]}
selected={selectedTab}
onSelect={handleTabChange}
Expand All @@ -118,11 +58,10 @@ export default function CinemaSelect() {

{/* 영화관 목록 */}
<TheaterList
data={theaters}
data={theaters ?? []}
selected={selectedAuditorium ? [selectedAuditorium] : []}
onSelect={(id) => setSelectedAuditorium(id)}
/>
{hasNext && <div ref={observerRef} className="h-[100px]" />}
</ReviewStepLayout>
);
}
2 changes: 1 addition & 1 deletion src/pages/review/ReviewContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default function ReviewTextForm() {
</div>

{/* 텍스트 입력 */}
<div className="flex flex-col gap-12 pt-6">
<div className="mb-30 flex flex-col gap-12 pt-6">
<InputField
label="제목"
placeholder="후기의 제목을 적어주세요"
Expand Down
3 changes: 2 additions & 1 deletion src/types/review.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface ReviewSummary {

export interface ReviewDetail {
movieTitle: string;
auditoriumId: string;
auditoriumName: string;
seatInfo: { seatId: string; seatNumber: string }[];
hashtags: Hashtag[];
Expand Down Expand Up @@ -95,4 +96,4 @@ export interface PaginatedBookmarkResponse {
hasNext: boolean;
page: number;
size: number;
}
}