From 6f41f87dc135f21e46f0c2b5630af5db0df64a40 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Sun, 2 Oct 2022 17:59:08 +1300 Subject: [PATCH] Improve readability of SetForm --- SetForm.tsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/SetForm.tsx b/SetForm.tsx index 9f6bf4f..41fcd2e 100644 --- a/SetForm.tsx +++ b/SetForm.tsx @@ -22,7 +22,7 @@ export default function SetForm({ const [name, setName] = useState(set.name); const [reps, setReps] = useState(set.reps.toString()); const [weight, setWeight] = useState(set.weight.toString()); - const [uri, setUri] = useState(set.image); + const [newImage, setNewImage] = useState(set.image); const [unit, setUnit] = useState(set.unit); const [showRemove, setShowRemove] = useState(false); const [selection, setSelection] = useState({ @@ -37,12 +37,12 @@ export default function SetForm({ const unitRef = useRef(null); const handleSubmit = async () => { - console.log(`${SetForm.name}.handleSubmit:`, {set, uri, name}); + console.log(`${SetForm.name}.handleSubmit:`, {set, uri: newImage, name}); if (!name) return; - let image = uri; - if (!uri && !set.image && !removeImage) + let image = newImage; + if (!newImage && !removeImage) image = await getSets({search: name, limit: 1, offset: 0}).then( - ([s]) => s?.image, + ([gotSet]) => gotSet?.image, ); console.log(`${SetForm.name}.handleSubmit:`, {image}); save({ @@ -75,11 +75,11 @@ export default function SetForm({ type: 'image/*', copyTo: 'documentDirectory', }); - if (fileCopyUri) setUri(fileCopyUri); + if (fileCopyUri) setNewImage(fileCopyUri); }, []); const handleRemove = useCallback(async () => { - setUri(''); + setNewImage(''); setRemoveImage(true); setShowRemove(false); }, []); @@ -140,15 +140,15 @@ export default function SetForm({ ))} )} - {!!settings.images && uri && ( + {!!settings.images && newImage && ( setShowRemove(true)}> - + )} - {!!settings.images && !uri && ( + {!!settings.images && !newImage && (