From 888ae576b082d749de0fcc470dfb66e1faa4a92e Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Sun, 18 Dec 2022 12:48:20 +1300 Subject: [PATCH] Reduce state in SetList The `set` state here was just a copy of the first element of `sets`. --- SetList.tsx | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/SetList.tsx b/SetList.tsx index 5b2d1df..05204ab 100644 --- a/SetList.tsx +++ b/SetList.tsx @@ -19,7 +19,6 @@ const limit = 15 export default function SetList() { const [sets, setSets] = useState([]) - const [set, setSet] = useState(defaultSet) const [offset, setOffset] = useState(0) const [term, setTerm] = useState('') const [end, setEnd] = useState(false) @@ -38,11 +37,6 @@ export default function SetList() { setSets(newSets) setOffset(0) setEnd(false) - const first = newSets[0] - if (!first) return - const newSet = {...first} - delete newSet.id - setSet(newSet) }, []) useFocusEffect( @@ -84,15 +78,13 @@ export default function SetList() { }, [term, end, offset, sets]) const onAdd = useCallback(async () => { - console.log(`${SetList.name}.onAdd`, {set}) const [{now}] = await getNow() - const newSet: GymSet = set || { - ...defaultSet, - created: now, - } - newSet.created = now - navigation.navigate('EditSet', {set: newSet}) - }, [navigation, set]) + let set = sets[0] + if (!set) set = {...defaultSet} + set.created = now + delete set.id + navigation.navigate('EditSet', {set}) + }, [navigation, sets]) const search = useCallback( (value: string) => {