self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Mobile: Resolves #2327: Handle back button when sort popup is open (#3187)

Browse Source
This commit is contained in:
roman-r-m
2020-05-14 16:03:13 +01:00
committed by GitHub
parent b5fc8e7fc1
commit 7d767cf0c9
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReactNativeClient/lib/components/screens/notes.js
View File

@@ -15,6 +15,7 @@ const { ActionButton } = require('lib/components/action-button.js');
const { dialogs } = require('lib/dialogs.js');
const DialogBox = require('react-native-dialogbox').default;
const { BaseScreenComponent } = require('lib/components/base-screen.js');
const { BackButtonService } = require('lib/services/back-button.js');
class NotesScreenComponent extends BaseScreenComponent {
static navigationOptions() {
@@ -68,6 +69,14 @@ class NotesScreenComponent extends BaseScreenComponent {
Setting.setValue(r.name, r.value);
};
this.backHandler = () => {
if (this.dialogbox.state.isVisible) {
this.dialogbox.close();
return true;
}
return false;
};
}
styles() {
@@ -91,10 +100,12 @@ class NotesScreenComponent extends BaseScreenComponent {
async componentDidMount() {
await this.refreshNotes();
AppState.addEventListener('change', this.onAppStateChange_);
BackButtonService.addHandler(this.backHandler);
}
async componentWillUnmount() {
AppState.removeEventListener('change', this.onAppStateChange_);
BackButtonService.removeHandler(this.backHandler);
}
async componentDidUpdate(prevProps) {