@ionic/vue-router
Advanced tools
Comparing version 5.4.0-dev.202008182003.fa76cc6 to 5.4.0-dev.202008182045.1e37b88
@@ -29,12 +29,12 @@ import { createLocationHistory } from './locationHistory'; | ||
const handleNavigateBack = (defaultHref, routerAnimation) => { | ||
console.log('--- Begin Navigate Back ---'); | ||
//console.log('--- Begin Navigate Back ---'); | ||
// todo grab default back button href from config | ||
const routeInfo = locationHistory.current(); | ||
console.log('Route Info', routeInfo); | ||
//console.log('Route Info', routeInfo) | ||
if (routeInfo && routeInfo.pushedByRoute) { | ||
const prevInfo = locationHistory.findLastLocation(routeInfo); | ||
if (prevInfo) { | ||
console.log('Prev Info', prevInfo); | ||
//console.log('Prev Info', prevInfo) | ||
incomingRouteParams = Object.assign(Object.assign({}, prevInfo), { routerAction: 'pop', routerDirection: 'back', routerAnimation: routerAnimation || routeInfo.routerAnimation }); | ||
console.log('Set incoming route params', incomingRouteParams); | ||
//console.log('Set incoming route params', incomingRouteParams) | ||
if (routeInfo.lastPathname === routeInfo.pushedByRoute) { | ||
@@ -54,3 +54,3 @@ router.back(); | ||
} | ||
console.log('--- End Navigate Back ---'); | ||
//console.log('--- End Navigate Back ---'); | ||
}; | ||
@@ -115,6 +115,6 @@ const handleNavigate = (path, routerAction, routerDirection, routerAnimation, tab) => { | ||
}; | ||
console.log('No route params, setting', incomingRouteParams); | ||
//console.log('No route params, setting', incomingRouteParams) | ||
} | ||
} | ||
console.log('Incoming Route Params', incomingRouteParams); | ||
//console.log('Incoming Route Params', incomingRouteParams) | ||
let routeInfo; | ||
@@ -124,3 +124,3 @@ if (incomingRouteParams === null || incomingRouteParams === void 0 ? void 0 : incomingRouteParams.id) { | ||
locationHistory.add(routeInfo); | ||
console.log('Incoming route params had id, current routeInfo', routeInfo); | ||
//console.log('Incoming route params had id, current routeInfo', routeInfo) | ||
} | ||
@@ -130,7 +130,7 @@ else { | ||
routeInfo = Object.assign(Object.assign({ id: generateId('routeInfo') }, incomingRouteParams), { lastPathname: leavingLocationInfo.pathname, pathname: location.path, search: location.fullPath && location.fullPath.split('?')[1] || '', params: location.params && location.params }); | ||
console.log('No id on incoming route params', routeInfo); | ||
//console.log('No id on incoming route params', routeInfo) | ||
if (isPushed) { | ||
routeInfo.tab = leavingLocationInfo.tab; | ||
routeInfo.pushedByRoute = leavingLocationInfo.pathname; | ||
console.log('Was pushed', routeInfo); | ||
//console.log('Was pushed', routeInfo); | ||
} | ||
@@ -140,3 +140,3 @@ else if (routeInfo.routerAction === 'pop') { | ||
routeInfo.pushedByRoute = route === null || route === void 0 ? void 0 : route.pushedByRoute; | ||
console.log('action pop', routeInfo); | ||
//console.log('action pop', routeInfo) | ||
} | ||
@@ -146,3 +146,3 @@ else if (routeInfo.routerAction === 'push' && routeInfo.tab !== leavingLocationInfo.tab) { | ||
routeInfo.pushedByRoute = lastRoute === null || lastRoute === void 0 ? void 0 : lastRoute.pushedByRoute; | ||
console.log('was push and switch tab', routeInfo); | ||
//console.log('was push and switch tab', routeInfo) | ||
} | ||
@@ -155,3 +155,3 @@ else if (routeInfo.routerAction === 'replace') { | ||
routeInfo.routerAnimation = (currentRouteInfo === null || currentRouteInfo === void 0 ? void 0 : currentRouteInfo.routerAnimation) || routeInfo.routerAnimation; | ||
console.log('was repalce', routeInfo); | ||
//console.log('was repalce',routeInfo) | ||
} | ||
@@ -158,0 +158,0 @@ locationHistory.add(routeInfo); |
{ | ||
"name": "@ionic/vue-router", | ||
"version": "5.4.0-dev.202008182003.fa76cc6", | ||
"version": "5.4.0-dev.202008182045.1e37b88", | ||
"description": "Vue Router integration for @ionic/vue", | ||
@@ -5,0 +5,0 @@ "scripts": { |
Sorry, the diff of this file is not supported yet
41091