octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Keep previous tab for next load

Browse Source
This commit is contained in:
Zhiyuan Zheng
2021-02-11 23:42:13 +01:00
parent 313b7af4a8
commit 3303864394
4 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/screens/Tabs.tsx
View File

@ -8,6 +8,7 @@ import {
import { NavigatorScreenParams } from '@react-navigation/native'
import { StackScreenProps } from '@react-navigation/stack'
import { useTimelineQuery } from '@utils/queryHooks/timeline'
import { getPreviousTab } from '@utils/slices/contextsSlice'
import {
getLocalAccount,
getLocalActiveIndex,
@ -41,7 +42,7 @@ const Tab = createBottomTabNavigator<Nav.ScreenTabsStackParamList>()
const ScreenTabs = React.memo(
({ navigation }: ScreenTabsProp) => {
const { theme } = useTheme()
const { mode, theme } = useTheme()
const dispatch = useDispatch()
const localActiveIndex = useSelector(getLocalActiveIndex)
const localAccount = useSelector(
@ -103,7 +104,7 @@ const ScreenTabs = React.memo(
showLabel: false,
...(Platform.OS === 'android' && { keyboardHidesTabBar: true })
}),
[theme, localActiveIndex]
[mode, localActiveIndex]
)
const localListeners = useCallback(
() => ({
@ -167,7 +168,11 @@ const ScreenTabs = React.memo(
return (
<Tab.Navigator
initialRouteName={localActiveIndex !== null ? 'Tab-Local' : 'Tab-Me'}
initialRouteName={
localActiveIndex !== null
? useSelector(getPreviousTab, () => true)
: 'Tab-Me'
}
screenOptions={screenOptions}
tabBarOptions={tabBarOptions}
>