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

Fix race condition in DrawerView (#4392)

Browse Source
This commit is contained in:
Eric Vicenti
2018-06-03 13:35:55 -07:00
parent 09bc4c3ba9
commit be81351160
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/react-navigation/src/views/Drawer/DrawerView.js vendored
View File

@@ -10,6 +10,8 @@ import DrawerActions from '../../routers/DrawerActions';
* Component that renders the drawer.
*/
export default class DrawerView extends React.PureComponent {
_drawerState = 'closed';
state = {
drawerWidth:
typeof this.props.navigationConfig.drawerWidth === 'function'
@@ -29,9 +31,11 @@ export default class DrawerView extends React.PureComponent {
const { isDrawerOpen } = this.props.navigation.state;
const wasDrawerOpen = prevProps.navigation.state.isDrawerOpen;
if (isDrawerOpen && !wasDrawerOpen) {
if (isDrawerOpen && !wasDrawerOpen && this._drawerState === 'closed') {
this._drawerState = 'opening';
this._drawer.openDrawer();
} else if (wasDrawerOpen && !isDrawerOpen) {
} else if (wasDrawerOpen && !isDrawerOpen && this._drawerState === 'open') {
this._drawerState = 'closing';
this._drawer.closeDrawer();
}
}
@@ -39,17 +43,19 @@ export default class DrawerView extends React.PureComponent {
_handleDrawerOpen = () => {
const { navigation } = this.props;
const { isDrawerOpen } = navigation.state;
if (!isDrawerOpen) {
if (!isDrawerOpen && this._drawerState === 'closed') {
navigation.dispatch({ type: DrawerActions.OPEN_DRAWER });
}
this._drawerState = 'open';
};
_handleDrawerClose = () => {
const { navigation } = this.props;
const { isDrawerOpen } = navigation.state;
if (isDrawerOpen) {
if (isDrawerOpen && this._drawerState === 'open') {
navigation.dispatch({ type: DrawerActions.CLOSE_DRAWER });
}
this._drawerState = 'closed';
};
_updateWidth = () => {