toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix closing app with Android Back Button (#1933)

Browse source
This commit is contained in:
Elias Nahum 2018-07-18 12:20:18 -04:00 committed by GitHub
parent e27ed497b1
commit f6a1927a27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/components/sidebars/settings/settings_sidebar.js
View file

@ -71,7 +71,7 @@ export default class SettingsDrawer extends PureComponent {
}
handleAndroidBack = () => {
if (this.refs.drawer) {
if (this.refs.drawer && this.drawerOpened) {
this.refs.drawer.closeDrawer();
return true;
}
@ -82,18 +82,24 @@ export default class SettingsDrawer extends PureComponent {
openSettingsSidebar = () => {
this.props.blurPostTextBox();
if (this.refs.drawer) {
if (this.refs.drawer && !this.drawerOpened) {
this.refs.drawer.openDrawer();
}
};
closeSettingsSidebar = () => {
if (this.refs.drawer) {
if (this.refs.drawer && this.drawerOpened) {
this.refs.drawer.closeDrawer();
}
};
handleDrawerClose = () => {
this.drawerOpened = false;
Keyboard.dismiss();
};
handleDrawerOpen = () => {
this.drawerOpened = true;
Keyboard.dismiss();
};
@ -347,6 +353,7 @@ export default class SettingsDrawer extends PureComponent {
<DrawerLayout
ref='drawer'
renderNavigationView={this.renderNavigationView}
onDrawerClose={this.handleDrawerClose}
onDrawerOpen={this.handleDrawerOpen}
drawerPosition='right'
drawerWidth={deviceWidth - DRAWER_INITIAL_OFFSET}