Skip to content
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

fix: 애니 리스트 페이지 무한 스크롤 발생 시, 스크롤 초기화 버그 수정 #345

Merged
merged 2 commits into from
Dec 27, 2023
Merged

fix: 애니 리스트 페이지 무한 스크롤 발생 시, 스크롤 초기화 버그 수정 #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ddf0db
fix: 무한 스크롤 발생 시, 스크롤 초기화 현상 수정
presentKey Dec 27, 2023
1e6aaf6
refactor: 요청 size를 REQUEST_SIZE 상수로 관리
presentKey Dec 27, 2023
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/features/animes/hooks/useAnimes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { useApi } from "@/hooks/useApi";

import { GetAnimesQuery } from "../api/AnimeApi";

import { REQUEST_SIZE } from "./useFilterAnimes";

interface UseAnimes {
/** 자동 fetch 여부 */
autoFetch?: boolean;
Expand All @@ -14,14 +16,18 @@ interface UseAnimes {

export default function useAnimes({
autoFetch = true,
queryParams = { size: 10, sort: "LATEST" },
queryParams = { size: REQUEST_SIZE, sort: "LATEST" },
}: UseAnimes) {
const { animeApi } = useApi();

return useInfiniteQuery({
queryKey: ["animes", queryParams],
queryFn: ({ pageParam }) =>
animeApi.getList({ size: 2, ...queryParams, cursor: pageParam }),
animeApi.getList({
size: REQUEST_SIZE,
...queryParams,
cursor: pageParam,
}),
getNextPageParam: (lastPage) => lastPage.cursor || undefined,
select: (data) => ({
pages: data.pages.flatMap((page) => page.items),
Expand Down
2 changes: 1 addition & 1 deletion src/features/animes/hooks/useFilterAnimes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export type AllFilterTypes =
| StatusFilter
| EpisodeCountFilter;

const REQUEST_SIZE = 10; // 요청당 개수
export const REQUEST_SIZE = 10; // 요청당 개수

/**
* @description 애니메이션 목록을 필터와 함께 조회합니다
Expand Down
18 changes: 10 additions & 8 deletions src/features/animes/routes/List/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Button from "@/components/Button";
import Empty from "@/components/Error/Empty";
import Head from "@/components/Head";
import Header from "@/components/Layout/Header";
import Loader from "@/components/Loader";
import { TabItem } from "@/components/Tabs";
import AnimeCard from "@/features/animes/components/AnimeCard";
import useIntersectionObserver from "@/hooks/useIntersectionObserver";
Expand Down Expand Up @@ -83,18 +84,16 @@ export default function AnimeList() {
onChange={(value) => changeSort(value as AnimeSort)}
/>
<Content>
{(animesQuery.isLoading || animesQuery.isFetching) &&
{animesQuery.isLoading &&
Array.from({ length: 7 }, (_, i) => (
<GridAnimeCardSkeleton key={i} />
))}

{!animesQuery.isLoading &&
!animesQuery.isFetching &&
animesQuery.data?.pages.length === 0 && (
<Empty message="애니가 없어요" />
)}
{animesQuery.data?.pages.length === 0 && (
<Empty message="애니가 없어요" />
)}

{!animesQuery.isLoading && !animesQuery.isFetching && (
{animesQuery.data && (
<>
{animesQuery.data?.pages.map((item) => (
<AnimeCard
Expand All @@ -103,9 +102,12 @@ export default function AnimeList() {
onClick={() => navigate(`/animes/${item.id}`)}
/>
))}
<div ref={observeRef}></div>
</>
)}

<div ref={observeRef} />

{animesQuery.isFetchingNextPage && <Loader display="oduck" />}
</Content>
<Filter
isVisible={bottomSheetVisible}
Expand Down