kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-10 09:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix drawer closing behavior

Browse Source
This commit is contained in:
Brent Vatne
2018-06-20 15:29:57 -07:00
committed by satyajit.happy
parent 03050875c7
commit 3990ea39c5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,13 +22,17 @@ export default class DrawerView extends React.PureComponent {
}
componentDidUpdate(prevProps) {
const { isDrawerOpen } = this.props.navigation.state;
const { isDrawerOpen, key } = this.props.navigation.state;
const prevKey = prevProps.navigation.state.key;
const wasDrawerOpen = prevProps.navigation.state.isDrawerOpen;
const shouldOpen = this._shouldOpen(isDrawerOpen, wasDrawerOpen);
const shouldClose =
this._shouldClose(isDrawerOpen, wasDrawerOpen) || key !== prevKey;
if (this._shouldOpen(isDrawerOpen, wasDrawerOpen)) {
if (shouldOpen) {
this._drawerState = 'opening';
this._drawer.openDrawer();
} else if (this._shouldClose(isDrawerOpen, wasDrawerOpen)) {
} else if (shouldClose) {
this._drawerState = 'closing';
this._drawer.closeDrawer();
}