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

Improved nav

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-09 00:57:30 +01:00
parent 53c23b1149
commit 4b44a8a782
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ReactNativeClient/root.js
View File

@@ -59,11 +59,14 @@ const reducer = (state = defaultState, action) => {
case 'Navigation/BACK':
if (!navHistory.length) break;
if (navHistory.length < 2) break;
action = navHistory.pop(); // Current page
if (!navHistory.length) break;
action = navHistory.pop(); // Previous page
// newState = Object.assign({}, state);
// newState.historyCanGoBack = false;
// Fall throught
case 'Navigation/NAVIGATE':
@@ -98,7 +101,6 @@ const reducer = (state = defaultState, action) => {
if (currentRouteName == action.routeName) {
// If the current screen is already the requested screen, don't do anything
} else {
//const nextStateNav = AppNavigator.router.getStateForAction(action, currentRouteName != 'Loading' ? state.nav : null);
const nextStateNav = AppNavigator.router.getStateForAction(action, state.nav);
if (nextStateNav) {
newState.nav = nextStateNav;
@@ -106,6 +108,10 @@ const reducer = (state = defaultState, action) => {
}
}
newState.historyCanGoBack = navHistory.length >= 2;
console.info(navHistory.length, newState.historyCanGoBack);
break;
// Replace all the notes with the provided array
@@ -203,10 +209,6 @@ const reducer = (state = defaultState, action) => {
}
if (action.type == 'Navigation/NAVIGATE' || action.type == 'Navigation/BACK') {
newState.historyCanGoBack = !!navHistory.length;
}
return newState;
}