diff --git a/src/components/templates/TeamRecommend.tsx b/src/components/templates/TeamRecommend.tsx index 3cf39191..539143fd 100644 --- a/src/components/templates/TeamRecommend.tsx +++ b/src/components/templates/TeamRecommend.tsx @@ -5,7 +5,6 @@ import { useCallback, useState } from 'react'; import { RecommendUserQueryOptions, useRecommendUserQuery } from '#/hooks/use-recommend'; import { RecommendFilter } from './TeamRecommend/RecommendFilter'; import { UserCardList } from './TeamRecommend/UserCardList'; -import { Loading } from '../atoms'; export const TeamRecommend = () => { const [options, setOptions] = useState({ @@ -17,6 +16,7 @@ export const TeamRecommend = () => { mutate: mutateCachedUsers, isValidating, setSize, + isLoading, } = useRecommendUserQuery(options); const queryTrigger = useCallback(() => setSize((s) => s + 1), [setSize]); @@ -46,17 +46,19 @@ export const TeamRecommend = () => { [mutateCachedUsers, users] ); - if (!users) return ; return ( <> - 0} - queryTrigger={queryTrigger} - mutateCachedLike={mutateCachedLike} - /> + {users && ( + 0} + queryTrigger={queryTrigger} + mutateCachedLike={mutateCachedLike} + isLoading={isLoading} + /> + )} ); }; diff --git a/src/components/templates/TeamRecommend/UserCardList.tsx b/src/components/templates/TeamRecommend/UserCardList.tsx index 73ebba93..7ce8bcf3 100644 --- a/src/components/templates/TeamRecommend/UserCardList.tsx +++ b/src/components/templates/TeamRecommend/UserCardList.tsx @@ -26,6 +26,7 @@ interface UserCardListProps { isLiked: boolean | Promise, optimisticIsLiked: boolean ) => void; + isLoading: boolean; } export const UserCardList = ({ @@ -34,6 +35,7 @@ export const UserCardList = ({ hasNext, queryTrigger, mutateCachedLike, + isLoading, }: UserCardListProps) => { const observerRef = useRef(null); @@ -74,7 +76,7 @@ export const UserCardList = ({ mutateCachedLike={mutateCachedLike} /> ))} - {hasNext && } + {isLoading && } );