Skip to content
Snippets Groups Projects
Commit 3fe0ede5 authored by tbt20's avatar tbt20
Browse files

HOTFIZ loading

parent 6a75cf98
No related branches found
No related tags found
1 merge request!297HOTFIX: Loading spinner no MEC
Pipeline #42342 passed
......@@ -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) &&
{ filterState.searchClass == "MEC" ? (mecLoading) && <Loading scroll={false} /> :
(isLoading ) &&
<Loading scroll={ isScroll} />
}
</>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment