Factor out list menu

This commit is contained in:
Brandon Presley 2022-12-21 13:02:53 +13:00
parent 75f2a8269a
commit f9e357ff80
3 changed files with 111 additions and 134 deletions

93
ListMenu.tsx Normal file
View File

@ -0,0 +1,93 @@
import {useState} from 'react'
import {Divider, IconButton, Menu} from 'react-native-paper'
import ConfirmDialog from './ConfirmDialog'
import useDark from './use-dark'
export default function ListMenu({
onEdit,
onCopy,
onClear,
onDelete,
ids,
}: {
onEdit: () => void
onCopy: () => void
onClear: () => void
onDelete: () => void
ids?: number[]
}) {
const [showMenu, setShowMenu] = useState(false)
const [showRemove, setShowRemove] = useState(false)
const dark = useDark()
const edit = () => {
setShowMenu(false)
onEdit()
}
const copy = () => {
setShowMenu(false)
onCopy()
}
const clear = () => {
setShowMenu(false)
onClear()
}
const remove = () => {
setShowMenu(false)
setShowRemove(false)
onDelete()
}
return (
<Menu
visible={showMenu}
onDismiss={() => setShowMenu(false)}
anchor={
<IconButton
color={dark ? 'white' : 'white'}
onPress={() => setShowMenu(true)}
icon="more-vert"
/>
}>
<Menu.Item
icon="edit"
title="Edit"
onPress={edit}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="content-copy"
title="Copy"
onPress={copy}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="clear"
title="Clear"
onPress={clear}
disabled={ids?.length === 0}
/>
<Divider />
<Menu.Item
icon="delete"
onPress={() => setShowRemove(true)}
title="Delete"
/>
<ConfirmDialog
title="Delete all"
show={showRemove}
setShow={setShowRemove}
onOk={remove}
onCancel={() => setShowMenu(false)}>
{ids?.length === 0 ? (
<>This irreversibly deletes records from the app. Are you sure?</>
) : (
<>This will delete {ids?.length} record(s). Are you sure?</>
)}
</ConfirmDialog>
</Menu>
)
}

View File

@ -5,24 +5,20 @@ import {
} from '@react-navigation/native' } from '@react-navigation/native'
import {useCallback, useState} from 'react' import {useCallback, useState} from 'react'
import {FlatList} from 'react-native' import {FlatList} from 'react-native'
import {Divider, IconButton, List, Menu} from 'react-native-paper' import {List} from 'react-native-paper'
import {Like} from 'typeorm' import {Like} from 'typeorm'
import ConfirmDialog from './ConfirmDialog'
import {planRepo} from './db' import {planRepo} from './db'
import DrawerHeader from './DrawerHeader' import DrawerHeader from './DrawerHeader'
import ListMenu from './ListMenu'
import Page from './Page' import Page from './Page'
import {Plan} from './plan' import {Plan} from './plan'
import {PlanPageParams} from './plan-page-params' import {PlanPageParams} from './plan-page-params'
import PlanItem from './PlanItem' import PlanItem from './PlanItem'
import useDark from './use-dark'
export default function PlanList() { export default function PlanList() {
const [term, setTerm] = useState('') const [term, setTerm] = useState('')
const [plans, setPlans] = useState<Plan[]>() const [plans, setPlans] = useState<Plan[]>()
const [ids, setIds] = useState<number[]>([]) const [ids, setIds] = useState<number[]>([])
const [showMenu, setShowMenu] = useState(false)
const [showRemove, setShowRemove] = useState(false)
const dark = useDark()
const navigation = useNavigation<NavigationProp<PlanPageParams>>() const navigation = useNavigation<NavigationProp<PlanPageParams>>()
const refresh = useCallback(async (value: string) => { const refresh = useCallback(async (value: string) => {
@ -58,14 +54,12 @@ export default function PlanList() {
navigation.navigate('EditPlan', {plan: {days: '', workouts: ''}}) navigation.navigate('EditPlan', {plan: {days: '', workouts: ''}})
const edit = useCallback(async () => { const edit = useCallback(async () => {
setShowMenu(false)
const plan = await planRepo.findOne({where: {id: ids.pop()}}) const plan = await planRepo.findOne({where: {id: ids.pop()}})
navigation.navigate('EditPlan', {plan}) navigation.navigate('EditPlan', {plan})
setIds([]) setIds([])
}, [ids, navigation]) }, [ids, navigation])
const copy = useCallback(async () => { const copy = useCallback(async () => {
setShowMenu(false)
const plan = await planRepo.findOne({ const plan = await planRepo.findOne({
where: {id: ids.pop()}, where: {id: ids.pop()},
}) })
@ -75,77 +69,25 @@ export default function PlanList() {
}, [ids, navigation]) }, [ids, navigation])
const clear = useCallback(() => { const clear = useCallback(() => {
setShowMenu(false)
setIds([]) setIds([])
}, []) }, [])
const remove = useCallback(async () => { const remove = useCallback(async () => {
setShowMenu(false)
setShowRemove(false)
await planRepo.delete(ids.length > 0 ? ids : {}) await planRepo.delete(ids.length > 0 ? ids : {})
await refresh(term) await refresh(term)
setIds([]) setIds([])
}, [ids, refresh, term]) }, [ids, refresh, term])
const menuItems = (
<>
<Menu.Item
icon="edit"
title="Edit"
onPress={edit}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="content-copy"
title="Copy"
onPress={copy}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="clear"
title="Clear"
onPress={clear}
disabled={ids?.length === 0}
/>
<Divider />
<Menu.Item
icon="delete"
onPress={() => setShowRemove(true)}
title="Delete"
/>
</>
)
return ( return (
<> <>
<DrawerHeader name="Plans"> <DrawerHeader name="Plans">
<Menu <ListMenu
visible={showMenu} onClear={clear}
onDismiss={() => setShowMenu(false)} onCopy={copy}
anchor={ onDelete={remove}
<IconButton onEdit={edit}
color={dark ? 'white' : 'white'} ids={ids}
onPress={() => setShowMenu(true)} />
icon="more-vert"
/>
}>
{menuItems}
<ConfirmDialog
title="Delete plans"
show={showRemove}
setShow={setShowRemove}
onOk={remove}
onCancel={() => setShowMenu(false)}>
{ids?.length === 0 ? (
<>
This irreversibly deletes all plans from the app. Are you sure?
</>
) : (
<>This will delete {ids?.length} plan(s). Are you sure?</>
)}
</ConfirmDialog>
</Menu>
</DrawerHeader> </DrawerHeader>
<Page onAdd={onAdd} term={term} search={search}> <Page onAdd={onAdd} term={term} search={search}>
{plans?.length === 0 ? ( {plans?.length === 0 ? (

View File

@ -5,17 +5,16 @@ import {
} from '@react-navigation/native' } from '@react-navigation/native'
import {useCallback, useState} from 'react' import {useCallback, useState} from 'react'
import {FlatList} from 'react-native' import {FlatList} from 'react-native'
import {Divider, IconButton, List, Menu} from 'react-native-paper' import {List} from 'react-native-paper'
import {Like} from 'typeorm' import {Like} from 'typeorm'
import ConfirmDialog from './ConfirmDialog'
import {getNow, setRepo, settingsRepo} from './db' import {getNow, setRepo, settingsRepo} from './db'
import DrawerHeader from './DrawerHeader' import DrawerHeader from './DrawerHeader'
import GymSet, {defaultSet} from './gym-set' import GymSet, {defaultSet} from './gym-set'
import {HomePageParams} from './home-page-params' import {HomePageParams} from './home-page-params'
import ListMenu from './ListMenu'
import Page from './Page' import Page from './Page'
import SetItem from './SetItem' import SetItem from './SetItem'
import Settings from './settings' import Settings from './settings'
import useDark from './use-dark'
const limit = 15 const limit = 15
@ -26,9 +25,6 @@ export default function SetList() {
const [end, setEnd] = useState(false) const [end, setEnd] = useState(false)
const [settings, setSettings] = useState<Settings>() const [settings, setSettings] = useState<Settings>()
const [ids, setIds] = useState<number[]>([]) const [ids, setIds] = useState<number[]>([])
const [showMenu, setShowMenu] = useState(false)
const [showRemove, setShowRemove] = useState(false)
const dark = useDark()
const navigation = useNavigation<NavigationProp<HomePageParams>>() const navigation = useNavigation<NavigationProp<HomePageParams>>()
const refresh = useCallback(async (value: string) => { const refresh = useCallback(async (value: string) => {
@ -104,13 +100,11 @@ export default function SetList() {
) )
const edit = useCallback(() => { const edit = useCallback(() => {
setShowMenu(false)
navigation.navigate('EditSets', {ids}) navigation.navigate('EditSets', {ids})
setIds([]) setIds([])
}, [ids, navigation]) }, [ids, navigation])
const copy = useCallback(async () => { const copy = useCallback(async () => {
setShowMenu(false)
const set = await setRepo.findOne({ const set = await setRepo.findOne({
where: {id: ids.pop()}, where: {id: ids.pop()},
}) })
@ -121,77 +115,25 @@ export default function SetList() {
}, [ids, navigation]) }, [ids, navigation])
const clear = useCallback(() => { const clear = useCallback(() => {
setShowMenu(false)
setIds([]) setIds([])
}, []) }, [])
const remove = useCallback(async () => { const remove = useCallback(async () => {
setIds([]) setIds([])
setShowMenu(false)
setShowRemove(false)
await setRepo.delete(ids.length > 0 ? ids : {}) await setRepo.delete(ids.length > 0 ? ids : {})
await refresh(term) await refresh(term)
}, [ids, refresh, term]) }, [ids, refresh, term])
const menuItems = (
<>
<Menu.Item
icon="edit"
title="Edit"
onPress={edit}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="content-copy"
title="Copy"
onPress={copy}
disabled={ids?.length === 0}
/>
<Menu.Item
icon="clear"
title="Clear"
onPress={clear}
disabled={ids?.length === 0}
/>
<Divider />
<Menu.Item
icon="delete"
onPress={() => setShowRemove(true)}
title="Delete"
/>
</>
)
return ( return (
<> <>
<DrawerHeader name="Home"> <DrawerHeader name="Home">
<Menu <ListMenu
visible={showMenu} onClear={clear}
onDismiss={() => setShowMenu(false)} onCopy={copy}
anchor={ onDelete={remove}
<IconButton onEdit={edit}
color={dark ? 'white' : 'white'} ids={ids}
onPress={() => setShowMenu(true)} />
icon="more-vert"
/>
}>
{menuItems}
<ConfirmDialog
title="Delete all"
show={showRemove}
setShow={setShowRemove}
onOk={remove}
onCancel={() => setShowMenu(false)}>
{ids?.length === 0 ? (
<>
This irreversibly deletes all sets from the app. Are you sure?
</>
) : (
<>This will delete {ids?.length} set(s). Are you sure?</>
)}
</ConfirmDialog>
</Menu>
</DrawerHeader> </DrawerHeader>
<Page onAdd={onAdd} term={term} search={search}> <Page onAdd={onAdd} term={term} search={search}>