self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

Handle mobile back button

Browse Source
This commit is contained in:
Laurent Cozic 2017-07-10 22:00:41 +01:00
parent 729235bf3c
commit e3e470683b
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ReactNativeClient/root.js
View File

@ -1,11 +1,8 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { View, Button, TextInput } from 'react-native'; import { BackHandler } from 'react-native';
import { connect } from 'react-redux' import { connect, Provider } from 'react-redux'
import { Provider } from 'react-redux'
import { createStore } from 'redux'; import { createStore } from 'redux';
import { combineReducers } from 'redux'; import { StackNavigator, addNavigationHelpers } from 'react-navigation';
import { StackNavigator } from 'react-navigation';
import { addNavigationHelpers } from 'react-navigation';
import { shimInit } from 'lib/shim-init-react.js'; import { shimInit } from 'lib/shim-init-react.js';
import { Log } from 'lib/log.js' import { Log } from 'lib/log.js'
import { Logger } from 'lib/logger.js' import { Logger } from 'lib/logger.js'
@ -221,7 +218,7 @@ const AppNavigator = StackNavigator({
let initializationState_ = 'waiting'; let initializationState_ = 'waiting';
async function initialize(dispatch) { async function initialize(dispatch, backButtonHandler) {
if (initializationState_ != 'waiting') return; if (initializationState_ != 'waiting') return;
shimInit(); shimInit();
@ -292,6 +289,10 @@ async function initialize(dispatch) {
reg.logger().error('Initialization error:', error); reg.logger().error('Initialization error:', error);
} }
BackHandler.addEventListener('hardwareBackPress', () => {
return backButtonHandler();
});
initializationState_ = 'done'; initializationState_ = 'done';
reg.logger().info('Application initialized'); reg.logger().info('Application initialized');
@ -300,7 +301,21 @@ async function initialize(dispatch) {
class AppComponent extends React.Component { class AppComponent extends React.Component {
async componentDidMount() { async componentDidMount() {
await initialize(this.props.dispatch); await initialize(this.props.dispatch, this.backButtonHandler.bind(this));
}
backButtonHandler() {
if (this.props.showSideMenu) {
this.props.dispatch({ type: 'SIDE_MENU_CLOSE' });
return true;
}
if (this.props.historyCanGoBack) {
this.props.dispatch({ type: 'Navigation/BACK' });
return true;
}
return false;
} }
sideMenu_change(isOpen) { sideMenu_change(isOpen) {
@ -335,7 +350,9 @@ defaultState.nav = AppNavigator.router.getStateForAction({
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
nav: state.nav nav: state.nav,
historyCanGoBack: state.historyCanGoBack,
showSideMenu: state.showSideMenu,
}; };
}; };