From b12b41b77e01bea5b03e55b25967f10137990a6e Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Fri, 8 Jul 2022 14:59:19 +1200
Subject: [PATCH] Factor out MassiveFab

---
 EditPlan.tsx   | 14 ++++++--------
 Home.tsx       | 11 +++--------
 MassiveFab.tsx | 16 ++++++++++++++++
 PlanItem.tsx   | 28 +++++++++++-----------------
 Plans.tsx      | 28 ++++++----------------------
 SetItem.tsx    | 13 +++++--------
 6 files changed, 47 insertions(+), 63 deletions(-)
 create mode 100644 MassiveFab.tsx

diff --git a/EditPlan.tsx b/EditPlan.tsx
index 14d8e25..b27c00f 100644
--- a/EditPlan.tsx
+++ b/EditPlan.tsx
@@ -17,13 +17,11 @@ const DAYS = [
 export default function EditPlan({
   plan,
   onSave,
-  show,
-  setShow,
+  setPlan,
 }: {
   onSave: () => void;
-  show: boolean;
-  setShow: (visible: boolean) => void;
   plan?: Plan;
+  setPlan: (plan?: Plan) => void;
 }) {
   const [days, setDays] = useState<string[]>([]);
   const [workouts, setWorkouts] = useState<string[]>([]);
@@ -41,7 +39,7 @@ export default function EditPlan({
 
   useEffect(() => {
     refresh();
-  }, [plan, show]);
+  }, [plan]);
 
   const save = async () => {
     if (!days || !workouts) return;
@@ -57,7 +55,7 @@ export default function EditPlan({
         `UPDATE plans SET days = ?, workouts = ? WHERE id = ?`,
         [newDays, newWorkouts, plan.id],
       );
-    setShow(false);
+    setPlan(undefined);
     onSave();
   };
 
@@ -79,7 +77,7 @@ export default function EditPlan({
 
   return (
     <Portal>
-      <Dialog visible={show} onDismiss={() => setShow(false)}>
+      <Dialog visible={!!plan} onDismiss={() => setPlan(undefined)}>
         <Dialog.Title>
           {plan ? `Edit "${days.slice(0, 2).join(', ')}"` : 'Add a plan'}
         </Dialog.Title>
@@ -123,7 +121,7 @@ export default function EditPlan({
           </View>
         </Dialog.Content>
         <Dialog.Actions>
-          <Button icon="close" onPress={() => setShow(false)}>
+          <Button icon="close" onPress={() => setPlan(undefined)}>
             Cancel
           </Button>
           <Button mode="contained" icon="save" onPress={save}>
diff --git a/Home.tsx b/Home.tsx
index d1fced4..b3f2b57 100644
--- a/Home.tsx
+++ b/Home.tsx
@@ -1,9 +1,10 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import React, {useContext, useEffect, useState} from 'react';
 import {FlatList, NativeModules, StyleSheet, View} from 'react-native';
-import {AnimatedFAB, List, Searchbar} from 'react-native-paper';
+import {List, Searchbar} from 'react-native-paper';
 import {DatabaseContext} from './App';
 import EditSet from './EditSet';
+import MassiveFab from './MassiveFab';
 import Set from './set';
 import SetItem from './SetItem';
 
@@ -99,13 +100,7 @@ export default function Home() {
       />
       <EditSet set={edit} setSet={setEdit} onSave={save} />
 
-      <AnimatedFAB
-        extended={false}
-        label="Add"
-        icon="add"
-        style={{position: 'absolute', right: 10, bottom: 50}}
-        onPress={() => setEdit({} as Set)}
-      />
+      <MassiveFab onPress={() => setEdit({} as Set)} />
     </View>
   );
 }
diff --git a/MassiveFab.tsx b/MassiveFab.tsx
new file mode 100644
index 0000000..a47489d
--- /dev/null
+++ b/MassiveFab.tsx
@@ -0,0 +1,16 @@
+import {AnimatedFAB} from 'react-native-paper';
+import React from 'react';
+
+export default function MassiveFab(
+  props: Partial<React.ComponentProps<typeof AnimatedFAB>>,
+) {
+  return (
+    <AnimatedFAB
+      {...props}
+      extended={false}
+      label="Add"
+      icon="add"
+      style={{position: 'absolute', right: 10, bottom: 50}}
+    />
+  );
+}
diff --git a/PlanItem.tsx b/PlanItem.tsx
index 829b67b..0987a54 100644
--- a/PlanItem.tsx
+++ b/PlanItem.tsx
@@ -1,20 +1,20 @@
 import React, {useContext, useState} from 'react';
-import {IconButton, List, Menu} from 'react-native-paper';
+import {GestureResponderEvent} from 'react-native';
+import {List, Menu} from 'react-native-paper';
 import {DatabaseContext} from './App';
 import {Plan} from './plan';
 
 export default function PlanItem({
   item,
   setPlan,
-  setShowEdit,
   onRemove,
 }: {
   item: Plan;
   setPlan: (plan: Plan) => void;
-  setShowEdit: (show: boolean) => void;
   onRemove: () => void;
 }) {
   const [show, setShow] = useState(false);
+  const [anchor, setAnchor] = useState({x: 0, y: 0});
   const db = useContext(DatabaseContext);
 
   const remove = async () => {
@@ -23,26 +23,20 @@ export default function PlanItem({
     onRemove();
   };
 
+  const longPress = (e: GestureResponderEvent) => {
+    setAnchor({x: e.nativeEvent.pageX, y: e.nativeEvent.pageY});
+    setShow(true);
+  };
+
   return (
     <>
       <List.Item
-        onPress={() => {
-          setPlan(item);
-          setShowEdit(true);
-        }}
+        onPress={() => setPlan(item)}
         title={item.days.replace(/,/g, ', ')}
         description={item.workouts.replace(/,/g, ', ')}
-        onLongPress={() => setShow(true)}
+        onLongPress={longPress}
         right={() => (
-          <Menu
-            anchor={
-              <IconButton
-                icon="ellipsis-vertical"
-                onPress={() => setShow(true)}
-              />
-            }
-            visible={show}
-            onDismiss={() => setShow(false)}>
+          <Menu anchor={anchor} visible={show} onDismiss={() => setShow(false)}>
             <Menu.Item icon="trash" onPress={remove} title="Delete" />
           </Menu>
         )}
diff --git a/Plans.tsx b/Plans.tsx
index 1b4dc0e..6e2d1ff 100644
--- a/Plans.tsx
+++ b/Plans.tsx
@@ -1,8 +1,9 @@
 import React, {useContext, useEffect, useState} from 'react';
 import {FlatList, StyleSheet, View} from 'react-native';
-import {AnimatedFAB, List, Searchbar} from 'react-native-paper';
+import {List, Searchbar} from 'react-native-paper';
 import {DatabaseContext} from './App';
 import EditPlan from './EditPlan';
+import MassiveFab from './MassiveFab';
 import {Plan} from './plan';
 import PlanItem from './PlanItem';
 
@@ -11,7 +12,6 @@ export default function Plans() {
   const [plans, setPlans] = useState<Plan[]>([]);
   const [refreshing, setRefresing] = useState(false);
   const [plan, setPlan] = useState<Plan>();
-  const [showEdit, setShowEdit] = useState(false);
   const db = useContext(DatabaseContext);
 
   const selectPlans = `
@@ -31,13 +31,7 @@ export default function Plans() {
   }, [search]);
 
   const renderItem = ({item}: {item: Plan}) => (
-    <PlanItem
-      item={item}
-      key={item.id}
-      setShowEdit={setShowEdit}
-      setPlan={setPlan}
-      onRemove={refresh}
-    />
+    <PlanItem item={item} key={item.id} setPlan={setPlan} onRemove={refresh} />
   );
 
   return (
@@ -61,21 +55,11 @@ export default function Plans() {
         }
       />
 
-      <EditPlan
-        onSave={refresh}
-        setShow={setShowEdit}
-        show={showEdit}
-        plan={plan}
-      />
+      <EditPlan setPlan={setPlan} onSave={refresh} plan={plan} />
 
-      <AnimatedFAB
-        extended={false}
-        label="Add"
-        icon="add"
-        style={{position: 'absolute', right: 20, bottom: 50}}
+      <MassiveFab
         onPress={() => {
-          setPlan(undefined);
-          setShowEdit(true);
+          setPlan({} as Plan);
         }}
       />
     </View>
diff --git a/SetItem.tsx b/SetItem.tsx
index 4d23d98..bcef938 100644
--- a/SetItem.tsx
+++ b/SetItem.tsx
@@ -13,25 +13,25 @@ export default function SetItem({
   setSet: (set: Set) => void;
   onRemove: () => void;
 }) {
-  const [showMenu, setShowMenu] = useState(false);
+  const [show, setShow] = useState(false);
   const [anchor, setAnchor] = useState({x: 0, y: 0});
   const db = useContext(DatabaseContext);
 
   const remove = async () => {
     await db.executeSql(`DELETE FROM sets WHERE id = ?`, [item.id]);
-    setShowMenu(false);
+    setShow(false);
     onRemove();
   };
 
   const copy = () => {
     const {id, ...set} = {...item};
     setSet(set);
-    setShowMenu(false);
+    setShow(false);
   };
 
   const longPress = (e: GestureResponderEvent) => {
     setAnchor({x: e.nativeEvent.pageX, y: e.nativeEvent.pageY});
-    setShowMenu(true);
+    setShow(true);
   };
 
   return (
@@ -44,10 +44,7 @@ export default function SetItem({
         description={`${item.reps} x ${item.weight}${item.unit}`}
         onLongPress={longPress}
         right={() => (
-          <Menu
-            anchor={anchor}
-            visible={showMenu}
-            onDismiss={() => setShowMenu(false)}>
+          <Menu anchor={anchor} visible={show} onDismiss={() => setShow(false)}>
             <Menu.Item icon="trash" onPress={remove} title="Delete" />
             <Menu.Item icon="copy" onPress={copy} title="Copy" />
           </Menu>