From c2accf7202d961b1adf71983025843b30c75365d Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Wed, 21 Feb 2024 17:56:37 +1300 Subject: [PATCH] Show delete button when sets are selected --- AppStack.tsx | 2 +- DrawerHeader.tsx | 8 +++++- ListMenu.tsx | 69 ++++++++++++++++++++++++++---------------------- SetList.tsx | 2 ++ 4 files changed, 47 insertions(+), 34 deletions(-) diff --git a/AppStack.tsx b/AppStack.tsx index 5f38323..ec9bc15 100644 --- a/AppStack.tsx +++ b/AppStack.tsx @@ -88,7 +88,7 @@ const styles = StyleSheet.create({ debugBanner: { position: 'absolute', top: 20, - right: 50, + right: 100, backgroundColor: 'red', zIndex: 1000, borderRadius: 5, diff --git a/DrawerHeader.tsx b/DrawerHeader.tsx index 3029794..25bde75 100644 --- a/DrawerHeader.tsx +++ b/DrawerHeader.tsx @@ -6,15 +6,21 @@ import { DrawerParams } from "./drawer-params"; export default function DrawerHeader({ name, children, + ids, + unSelect, }: { name: string; children?: JSX.Element | JSX.Element[]; + ids?: number[], + unSelect?: () => void, }) { const navigation = useNavigation>(); return ( - + {ids && ids.length > 0 ? () : ( + + )} {children} diff --git a/ListMenu.tsx b/ListMenu.tsx index f055ecf..18f75d6 100644 --- a/ListMenu.tsx +++ b/ListMenu.tsx @@ -47,40 +47,45 @@ export default function ListMenu({ }; return ( - setShowMenu(false)} - anchor={ - setShowMenu(true)} icon="dots-vertical" /> - } - > - - - - {onCopy && ( + <> + {ids.length > 0 && ( + setShowRemove(true)} /> + )} + setShowMenu(false)} + anchor={ + setShowMenu(true)} icon="dots-vertical" /> + } + > + - )} - - setShowRemove(true)} - title="Delete" - /> + + {onCopy && ( + + )} + + setShowRemove(true)} + title="Delete" + /> + This will delete {ids?.length} record(s). Are you sure? )} - + ); } diff --git a/SetList.tsx b/SetList.tsx index b8aa66e..5c2c1ae 100644 --- a/SetList.tsx +++ b/SetList.tsx @@ -164,6 +164,8 @@ export default function SetList() { <> 0 ? `${ids.length} selected` : "History"} + ids={ids} + unSelect={() => setIds([])} >