javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-17 18:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(vue): replacing routes now updates location state correctly (#24721)

Browse Source 
resolves #24432

Co-authored-by: tigohenryschultz <tigohenryschultz@users.noreply.github.com>
Co-authored-by: yoyo930021 <yoyo930021@users.noreply.github.com>
This commit is contained in:
Liam DeBeasi
2022-02-07 15:37:43 -05:00
committed by GitHub
parent 8c22646d66
commit 721a461073
6 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/vue-router/src/router.ts
View File

@ -155,8 +155,15 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
) => {
let leavingLocationInfo: RouteInfo;
if (incomingRouteParams) {
/**
* If we are replacing the state of a route
* with another route, the "leaving" route
* is at the same position in location history
* as where the replaced route will exist.
*/
if (incomingRouteParams.routerAction === 'replace') {
leavingLocationInfo = locationHistory.previous();
leavingLocationInfo = locationHistory.current(initialHistoryPosition, currentHistoryPosition);
} else if (incomingRouteParams.routerAction === 'pop') {
leavingLocationInfo = locationHistory.current(initialHistoryPosition, currentHistoryPosition + 1);
@ -334,8 +341,18 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
* item for this route. In other words, a user
* is navigating within the history without pushing
* new items within the stack.
*
* If the historySize === historyDiff,
* then we are still re-writing history
* by replacing the current route state
* with a new route state. The initial
* action when loading an app is
* going to be replace operation, so
* we want to make sure we exclude that
* action by ensuring historySize > 0.
*/
if (historySize > historyDiff && routeInfo.tab === undefined) {
const isReplacing = historySize === historyDiff && historySize > 0 && action === 'replace';
if (historySize > historyDiff || isReplacing) {
/**
* When navigating back through the history,
* if users then push a new route the future
@ -354,7 +371,10 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
* in other scenarios.
*/
if (routeInfo.routerAction === 'push' && delta === undefined) {
if (
(routeInfo.routerAction === 'push' || routeInfo.routerAction === 'replace') &&
delta === undefined
) {
locationHistory.clearHistory(routeInfo);
locationHistory.add(routeInfo);
}