From 3fe0ede5a3842c7dc6a17a8574d3a6943a259d80 Mon Sep 17 00:00:00 2001
From: ThomasTodt <tbt20@inf.ufpr.br>
Date: Thu, 15 May 2025 10:12:10 -0300
Subject: [PATCH] HOTFIZ loading
---
src/app/components/InfiniteScroll.js | 15 ++++++++++-----
src/app/components/Loading.js | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/app/components/InfiniteScroll.js b/src/app/components/InfiniteScroll.js
index a92b40dd..ba1d3639 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 da30aaff..5c040ffe 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"} `}>
--
GitLab