From 7483a504ee16a350a463f611ef6cc3b7a83a210b Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Wed, 14 Dec 2022 18:54:20 +1300 Subject: [PATCH] Fix typescript errors --- DrawerHeader.tsx | 4 ++-- DrawerMenu.tsx | 37 +++++++++++++++++++++++-------------- EditSets.tsx | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/DrawerHeader.tsx b/DrawerHeader.tsx index d1db80c..fb3529a 100644 --- a/DrawerHeader.tsx +++ b/DrawerHeader.tsx @@ -11,8 +11,8 @@ export default function DrawerHeader({ setIds, }: { name: keyof DrawerParamList - ids: number[] - setIds: (values: number[]) => void + ids?: number[] + setIds?: (values: number[]) => void }) { const navigation = useNavigation>() const dark = useDark() diff --git a/DrawerMenu.tsx b/DrawerMenu.tsx index e5670d3..739d5b2 100644 --- a/DrawerMenu.tsx +++ b/DrawerMenu.tsx @@ -14,8 +14,8 @@ export default function DrawerMenu({ setIds, }: { name: keyof DrawerParamList - ids: number[] - setIds: (values: number[]) => void + ids?: number[] + setIds?: (values: number[]) => void }) { const [showMenu, setShowMenu] = useState(false) const [showRemove, setShowRemove] = useState(false) @@ -78,16 +78,25 @@ export default function DrawerMenu({ icon="more-vert" /> }> - {ids.length === 1 && ( - - )} - {ids.length > 0 && ( - <> - - - - - )} + + + + setShowMenu(false)}> - {ids.length === 0 ? ( + {ids?.length === 0 ? ( <>This irreversibly deletes all data from the app. Are you sure? ) : ( - <>This will delete {ids.length} records. Are you sure? + <>This will delete {ids?.length} records. Are you sure? )} diff --git a/EditSets.tsx b/EditSets.tsx index 88edb7c..9d084b2 100644 --- a/EditSets.tsx +++ b/EditSets.tsx @@ -110,7 +110,7 @@ export default function EditSets() { {settings.showUnit && (