From 22f5f3c9eeb67e9607ac90063ccad75f196d0291 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Wed, 18 Oct 2023 09:56:09 +1300 Subject: [PATCH] Only show loading on pull-down for SetList --- SetList.tsx | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/SetList.tsx b/SetList.tsx index 09486dc..845b5ce 100644 --- a/SetList.tsx +++ b/SetList.tsx @@ -41,15 +41,12 @@ export default function SetList() { const reset = useCallback( async ({ value, skip }: { value: string; skip: number }) => { - setRefreshing(true); - const newSets = await setRepo - .find({ - where: { name: Like(`%${value.trim()}%`), hidden: 0 as any }, - take: LIMIT, - skip, - order: { created: "DESC" }, - }) - .finally(() => setRefreshing(false)); + const newSets = await setRepo.find({ + where: { name: Like(`%${value.trim()}%`), hidden: 0 as any }, + take: LIMIT, + skip, + order: { created: "DESC" }, + }); console.log(`${SetList.name}.refresh:`, { value, offset }); setSets(newSets); setEnd(false); @@ -116,15 +113,12 @@ export default function SetList() { if (end || refreshing) return; const newOffset = offset + LIMIT; console.log(`${SetList.name}.next:`, { offset, newOffset, term }); - setRefreshing(true); - const newSets = await setRepo - .find({ - where: { name: Like(`%${term}%`), hidden: 0 as any }, - take: LIMIT, - skip: newOffset, - order: { created: "DESC" }, - }) - .finally(() => setRefreshing(false)); + const newSets = await setRepo.find({ + where: { name: Like(`%${term}%`), hidden: 0 as any }, + take: LIMIT, + skip: newOffset, + order: { created: "DESC" }, + }); if (newSets.length === 0) return setEnd(true); if (!sets) return; const map = new Map(); @@ -198,10 +192,11 @@ export default function SetList() { keyExtractor={(set) => set.id.toString()} onRefresh={() => { setOffset(0); + setRefreshing(true); reset({ skip: 0, value: term, - }); + }).finally(() => setRefreshing(false)); }} /> );