OK nav context is not working, todo
This commit is contained in:
@@ -47,6 +47,8 @@ type NativeStackNavigationOptionsWithAuth = NativeStackNavigationOptions & {
|
|||||||
requireAuth?: boolean
|
requireAuth?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let prevActiveRouteName: string | undefined
|
||||||
|
|
||||||
function NativeStackNavigator({
|
function NativeStackNavigator({
|
||||||
id,
|
id,
|
||||||
initialRouteName,
|
initialRouteName,
|
||||||
@@ -115,10 +117,6 @@ function NativeStackNavigator({
|
|||||||
const {setShowLoggedOut} = useLoggedOutViewControls()
|
const {setShowLoggedOut} = useLoggedOutViewControls()
|
||||||
const {isMobile} = useWebMediaQueries()
|
const {isMobile} = useWebMediaQueries()
|
||||||
const {leftNavMinimal} = useLayoutBreakpoints()
|
const {leftNavMinimal} = useLayoutBreakpoints()
|
||||||
const prevActiveRouteName = React.useRef<string | undefined>(undefined)
|
|
||||||
React.useEffect(() => {
|
|
||||||
prevActiveRouteName.current = activeRoute.name
|
|
||||||
}, [activeRoute.name])
|
|
||||||
|
|
||||||
if (!hasSession && (activeRouteRequiresAuth || IS_NATIVE)) {
|
if (!hasSession && (activeRouteRequiresAuth || IS_NATIVE)) {
|
||||||
return <LoggedOut />
|
return <LoggedOut />
|
||||||
@@ -157,7 +155,7 @@ function NativeStackNavigator({
|
|||||||
<AnalyticsContext
|
<AnalyticsContext
|
||||||
metadata={utils.useMeta({
|
metadata={utils.useMeta({
|
||||||
navigation: {
|
navigation: {
|
||||||
previousScreen: prevActiveRouteName.current,
|
previousScreen: prevActiveRouteName || activeRoute.name,
|
||||||
currentScreen: activeRoute.name,
|
currentScreen: activeRoute.name,
|
||||||
},
|
},
|
||||||
})}>
|
})}>
|
||||||
|
|||||||
Reference in New Issue
Block a user