kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-12 22:30:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add back old drawer behavior with unmountInactiveRoutes config

Browse Source
This commit is contained in:
Brent Vatne
2018-10-30 18:51:28 -07:00
committed by satyajit.happy
parent af05a87e83
commit 05fafbf65e
2 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/drawer/src/views/DrawerSidebar.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import { StyleSheet, View } from 'react-native';
import { NavigationActions, StackActions } from '@react-navigation/core';
import { NavigationActions } from '@react-navigation/core';
import invariant from '../utils/invariant';
/**

90
packages/drawer/src/views/DrawerView.js
View File

@@ -139,12 +139,59 @@ export default class DrawerView extends React.PureComponent {
);
};
_renderContent = () => {
let { lazy, navigation } = this.props;
let { loaded } = this.state;
let { routes } = navigation.state;
if (this.props.navigationConfig.unmountInactiveRoutes) {
let activeKey = navigation.state.routes[navigation.state.index].key;
let descriptor = this.props.descriptors[activeKey];
return (
<SceneView
navigation={descriptor.navigation}
screenProps={this.props.screenProps}
component={descriptor.getComponent()}
/>
);
} else {
return (
<ScreenContainer style={styles.pages}>
{routes.map((route, index) => {
if (lazy && !loaded.includes(index)) {
// Don't render a screen if we've never navigated to it
return null;
}
let isFocused = navigation.state.index === index;
let descriptor = this.props.descriptors[route.key];
return (
<ResourceSavingScene
key={route.key}
style={[
StyleSheet.absoluteFill,
{ opacity: isFocused ? 1 : 0 },
]}
isVisible={isFocused}
>
<SceneView
navigation={descriptor.navigation}
screenProps={this.props.screenProps}
component={descriptor.getComponent()}
/>
</ResourceSavingScene>
);
})}
</ScreenContainer>
);
}
};
render() {
const { lazy, navigation } = this.props;
const { loaded } = this.state;
const { state } = navigation;
const { routes } = state;
const activeKey = routes[state.index].key;
const { navigation } = this.props;
const activeKey = navigation.state.routes[navigation.state.index].key;
const { drawerLockMode } = this.props.descriptors[activeKey].options;
return (
@@ -180,37 +227,12 @@ export default class DrawerView extends React.PureComponent {
statusBarAnimation={this.props.navigationConfig.statusBarAnimation}
minSwipeDistance={this.props.navigationConfig.minSwipeDistance}
overlayColor={this.props.navigationConfig.overlayColor}
contentContainerStyle={this.props.navigationConfig.contentContainerStyle}
contentContainerStyle={
this.props.navigationConfig.contentContainerStyle
}
>
<DrawerGestureContext.Provider value={this.drawerGestureRef}>
<ScreenContainer style={styles.pages}>
{routes.map((route, index) => {
if (lazy && !loaded.includes(index)) {
// Don't render a screen if we've never navigated to it
return null;
}
const isFocused = navigation.state.index === index;
const descriptor = this.props.descriptors[route.key];
return (
<ResourceSavingScene
key={route.key}
style={[
StyleSheet.absoluteFill,
{ opacity: isFocused ? 1 : 0 },
]}
isVisible={isFocused}
>
<SceneView
navigation={descriptor.navigation}
screenProps={this.props.screenProps}
component={descriptor.getComponent()}
/>
</ResourceSavingScene>
);
})}
</ScreenContainer>
{this._renderContent()}
</DrawerGestureContext.Provider>
</DrawerLayout>
);