Hide top drawer menu on EditPlan

This commit is contained in:
Brandon Presley 2022-08-25 13:06:50 +12:00
parent 2c9242b03f
commit 32be938c86
4 changed files with 13 additions and 8 deletions

View File

@ -9,6 +9,7 @@ import {List, Searchbar} from 'react-native-paper';
import {DatabaseContext} from './App'; import {DatabaseContext} from './App';
import Best from './best'; import Best from './best';
import {BestPageParams} from './BestPage'; import {BestPageParams} from './BestPage';
import DrawerMenu from './DrawerMenu';
export default function BestList() { export default function BestList() {
const [bests, setBests] = useState<Best[]>([]); const [bests, setBests] = useState<Best[]>([]);
@ -47,7 +48,10 @@ export default function BestList() {
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
refresh(); refresh();
}, [refresh]), navigation.getParent()?.setOptions({
headerRight: () => null,
});
}, [refresh, navigation]),
); );
useEffect(() => { useEffect(() => {

View File

@ -1,14 +1,12 @@
import { import {
DarkTheme,
DefaultTheme,
RouteProp, RouteProp,
useFocusEffect, useFocusEffect,
useNavigation, useNavigation,
useRoute, useRoute,
} from '@react-navigation/native'; } from '@react-navigation/native';
import React, {useCallback, useContext, useEffect, useState} from 'react'; import React, {useCallback, useContext, useEffect, useState} from 'react';
import {ScrollView, StyleSheet, Text, useColorScheme, View} from 'react-native'; import {ScrollView, StyleSheet, Text, View} from 'react-native';
import {Button, IconButton, Switch} from 'react-native-paper'; import {Button, IconButton} from 'react-native-paper';
import {DatabaseContext} from './App'; import {DatabaseContext} from './App';
import MassiveSwitch from './MassiveSwitch'; import MassiveSwitch from './MassiveSwitch';
import {PlanPageParams} from './PlanPage'; import {PlanPageParams} from './PlanPage';
@ -23,7 +21,6 @@ export default function EditPlan() {
const [names, setNames] = useState<string[]>([]); const [names, setNames] = useState<string[]>([]);
const db = useContext(DatabaseContext); const db = useContext(DatabaseContext);
const navigation = useNavigation(); const navigation = useNavigation();
const dark = useColorScheme() === 'dark';
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
@ -31,6 +28,7 @@ export default function EditPlan() {
headerLeft: () => ( headerLeft: () => (
<IconButton icon="arrow-back" onPress={() => navigation.goBack()} /> <IconButton icon="arrow-back" onPress={() => navigation.goBack()} />
), ),
headerRight: () => null,
title: 'Plan', title: 'Plan',
}); });
}, [navigation]), }, [navigation]),

View File

@ -7,6 +7,7 @@ import React, {useCallback, useContext, useEffect, useState} from 'react';
import {FlatList, StyleSheet, View} from 'react-native'; import {FlatList, StyleSheet, View} from 'react-native';
import {List, Searchbar} from 'react-native-paper'; import {List, Searchbar} from 'react-native-paper';
import {DatabaseContext} from './App'; import {DatabaseContext} from './App';
import DrawerMenu from './DrawerMenu';
import MassiveFab from './MassiveFab'; import MassiveFab from './MassiveFab';
import {Plan} from './plan'; import {Plan} from './plan';
import PlanItem from './PlanItem'; import PlanItem from './PlanItem';
@ -33,7 +34,10 @@ export default function PlanList() {
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
refresh(); refresh();
}, [refresh]), navigation.getParent()?.setOptions({
headerRight: () => <DrawerMenu name="Plans" />,
});
}, [refresh, navigation]),
); );
useEffect(() => { useEffect(() => {

View File

@ -41,7 +41,6 @@ export default function Routes({db}: {db: SQLiteDatabase | null}) {
name={route.name} name={route.name}
component={route.component} component={route.component}
options={{ options={{
headerRight: () => <DrawerMenu name={route.name} />,
drawerIcon: ({focused}) => ( drawerIcon: ({focused}) => (
<IconButton <IconButton
icon={focused ? route.icon : `${route.icon}-outline`} icon={focused ? route.icon : `${route.icon}-outline`}