javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into update-from-main

Browse Source
This commit is contained in:
Brandy Smith
2026-03-04 15:16:31 -05:00
parent d29ac713fa 2be39da9d3
commit af0949f5bb
299 changed files with 2171 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/angular/common/src/providers/nav-controller.ts
View File

@@ -1,6 +1,14 @@
import { Location } from '@angular/common';
import { Injectable, Optional } from '@angular/core';
import { NavigationExtras, Router, UrlSerializer, UrlTree, NavigationStart } from '@angular/router';
import {
NavigationExtras,
Router,
UrlSerializer,
UrlTree,
NavigationStart,
NavigationCancel,
NavigationError,
} from '@angular/router';
import type { AnimationBuilder, NavDirection, RouterDirection } from '@ionic/core/components';
import { IonRouterOutlet } from '../directives/navigation/router-outlet';
@@ -42,6 +50,14 @@ export class NavController {
this.guessDirection = this.guessAnimation = id < this.lastNavId ? 'back' : 'forward';
this.lastNavId = this.guessDirection === 'forward' ? ev.id : id;
}
// Reset explicit direction when navigation is canceled (e.g., guard rejection)
// to prevent stale direction from leaking into the next navigation
if (ev instanceof NavigationCancel || ev instanceof NavigationError) {
this.direction = DEFAULT_DIRECTION;
this.animated = DEFAULT_ANIMATED;
this.animationBuilder = undefined;
}
});
}