diff --git a/src/app/components/InfiniteScroll.js b/src/app/components/InfiniteScroll.js index a92b40dd9cb91bb97e2a9c22580405484a6e1a5d..ba1d3639244aa7b1e12f85a3fb9f08f5a1de86c0 100644 --- a/src/app/components/InfiniteScroll.js +++ b/src/app/components/InfiniteScroll.js @@ -31,7 +31,7 @@ const getUrlFromFilterState = (filterState, page) => { */ export default function InfiniteScroll({ filterState, setNewSize, newSize, setItems, items, abortController }) { const [isLoading, setIsLoading] = useState(false); - const [mecLoading, setMecLoading] = useState(false); + const [mecLoading, setMecLoading] = useState(true); const [page, setPage] = useState(0); const [isScroll, setIsScroll] = useState(false) const router = useRouter(); @@ -40,7 +40,9 @@ export default function InfiniteScroll({ filterState, setNewSize, newSize, setIt const [totalCount, setTotalCount] = useState(1) const fetchData = useCallback(async (page) => { + setIsLoading(true); + const url = getUrlFromFilterState(filterState, page); try { const { data, headers } = await mecredApi.get(url, { @@ -85,7 +87,8 @@ export default function InfiniteScroll({ filterState, setNewSize, newSize, setIt } // Busca mais dados - fetchData(page); + // Só faz a requisição se não for na página do MEC + !(filterState.searchClass == "MEC") && fetchData(page); }, [fetchData, isLoading, page]); //caso o filtro seja alterado, seta o site para o topo da tela @@ -99,7 +102,6 @@ export default function InfiniteScroll({ filterState, setNewSize, newSize, setIt window.addEventListener("scroll", handleScroll); return () => window.removeEventListener("scroll", handleScroll); }, [isLoading, handleScroll]); - return ( <> @@ -116,8 +118,11 @@ export default function InfiniteScroll({ filterState, setNewSize, newSize, setIt } </div> - {(isLoading || !mecLoading) && - <Loading scroll={isScroll} /> + + { filterState.searchClass == "MEC" ? (mecLoading) && <Loading scroll={false} /> : + (isLoading ) && + <Loading scroll={ isScroll} /> + } </> diff --git a/src/app/components/Loading.js b/src/app/components/Loading.js index da30aaffc4f3a4fcf6831d7eab9e7211dacfbf65..5c040ffefcbfba11110c6c15dcac8fdac2c23ebd 100644 --- a/src/app/components/Loading.js +++ b/src/app/components/Loading.js @@ -4,7 +4,7 @@ * @returns um componente de loading */ -export default function Loading({ scroll, loaded, children }) { +export default function Loading({ scroll , loaded , children }) { return ( loaded ? children : <div className={`text-center mt-10 ${scroll ? "fixed w-screen left-[0%] top-[40%] " : "relative mb-8"} `}>