Skip to content

fix/ 데이터 기본 정렬(오래된순)으로 복구 #140

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
youdaeng2 merged 1 commit into from
Aug 4, 2025
Merged

fix/ 데이터 기본 정렬(오래된순)으로 복구 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 2 additions & 22 deletions src/components/my-profile/ReviewList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export function ReviewList({ setTotalCount }: ReviewListProps) {
const [deleteReviewId, setDeleteReviewId] = useState<number | null>(null);

const observerRef = useRef<HTMLDivElement | null>(null); // 옵저버 대상 요소
const prevScrollY = useRef<number>(0); // 추가됨: fetch 이전 스크롤 위치 기억용

// 무한 스크롤 쿼리 세팅
const { data, isError, error, fetchNextPage, hasNextPage, isFetchingNextPage } = useInfiniteQuery(
Expand All @@ -52,37 +51,18 @@ export function ReviewList({ setTotalCount }: ReviewListProps) {
}
}, [data, setTotalCount]);

// 👀 IntersectionObserver 감지 로직 연결
// IntersectionObserver 감지 로직 연결
useInfiniteScroll({
targetRef: observerRef,
hasNextPage,
fetchNextPage,
isFetching: isFetchingNextPage,
});

// fetch 시작 전 현재 스크롤 위치 기억 (스크롤 튐 방지 목적)
useEffect(() => {
if (isFetchingNextPage) {
prevScrollY.current = window.scrollY;
}
}, [isFetchingNextPage]);

// fetch 완료 후 이전 스크롤 위치로 복원
useEffect(() => {
if (!isFetchingNextPage) {
requestAnimationFrame(() => {
window.scrollTo({ top: prevScrollY.current, behavior: 'instant' });
});
}
}, [data?.pages.length]);

if (isError) throw error;

// 정렬: 최신순 (createdAt 기준 내림차순)
const reviews: MyReview[] =
data?.pages
?.flatMap((page) => page.list ?? [])
?.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()) ?? [];
const reviews: MyReview[] = data?.pages?.flatMap((page) => page?.list ?? []) ?? [];

// 빈 목록 처리
if (!data || !data.pages) {
Expand Down
20 changes: 1 addition & 19 deletions src/components/my-profile/WineList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ interface WineListProps {
*/
export function WineList({ setTotalCount }: WineListProps) {
const observerRef = useRef<HTMLDivElement | null>(null);
const prevScrollY = useRef<number>(0); // 스크롤 위치 저장용 ref

const [editWine, setEditWine] = useState<MyWine | null>(null);
const [deleteWineId, setDeleteWineId] = useState<number | null>(null);
Expand Down Expand Up @@ -59,27 +58,10 @@ export function WineList({ setTotalCount }: WineListProps) {
isFetching: isFetchingNextPage,
});

// fetch 시작 전에 현재 스크롤 위치 저장
useEffect(() => {
if (isFetchingNextPage) {
prevScrollY.current = window.scrollY;
}
}, [isFetchingNextPage]);

// fetch 완료 후 이전 스크롤 위치로 복원
useEffect(() => {
if (!isFetchingNextPage) {
requestAnimationFrame(() => {
window.scrollTo({ top: prevScrollY.current, behavior: 'instant' });
});
}
}, [data?.pages.length]);

if (isError) throw error;

// 최신순 (ID 기준 내림차순)
const wines: MyWine[] =
data?.pages?.flatMap((page) => page?.list ?? [])?.sort((a, b) => b.id - a.id) ?? [];
const wines: MyWine[] = data?.pages?.flatMap((page) => page?.list ?? []) ?? [];

// 빈 목록 처리
if (!data || !data.pages) {
Expand Down