From 4eaf2c2134f2168089628847dbbe353cc775b341 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Fri, 30 Sep 2022 13:12:11 +1300 Subject: [PATCH] Give new sets no image instead of last sets image Closes #72 --- SetForm.tsx | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/SetForm.tsx b/SetForm.tsx index 14ecfa7..1250ea9 100644 --- a/SetForm.tsx +++ b/SetForm.tsx @@ -1,4 +1,4 @@ -import React, {useContext, useEffect, useRef, useState} from 'react'; +import React, {useContext, useRef, useState} from 'react'; import {ScrollView, View} from 'react-native'; import {Button, Text} from 'react-native-paper'; import MassiveInput from './MassiveInput'; @@ -20,7 +20,6 @@ export default function SetForm({ const [reps, setReps] = useState(set.reps.toString()); const [weight, setWeight] = useState(set.weight.toString()); const [unit, setUnit] = useState(set.unit); - const [uri, setUri] = useState(set.image); const [selection, setSelection] = useState({ start: 0, end: set.reps.toString().length, @@ -30,23 +29,22 @@ export default function SetForm({ const repsRef = useRef(null); const unitRef = useRef(null); - useEffect(() => { - console.log('SetForm.useEffect:', {uri, name: set.name}); - if (!uri) - getSets({search: set.name, limit: 1, offset: 0}).then(([s]) => - setUri(s?.image), - ); - }, [uri, set.name]); - - const handleSubmit = () => { + const handleSubmit = async () => { + console.log(`${SetForm.name}.handleSubmit:`, {set}); if (!name) return; + let saveImage = set.image; + if (!set.image) + saveImage = await getSets({search: name, limit: 1, offset: 0}).then( + ([s]) => s?.image, + ); + console.log(`${SetForm.name}.handleSubmit:`, {saveImage}); save({ name, reps: Number(reps), weight: Number(weight), id: set.id, unit, - image: uri, + image: saveImage, minutes: Number(set.minutes ?? 3), seconds: Number(set.seconds ?? 30), sets: set.sets ?? 3,