diff --git a/packages/angular/common/src/directives/navigation/back-button.ts b/packages/angular/common/src/directives/navigation/back-button.ts index cdad44d165..e455f02079 100644 --- a/packages/angular/common/src/directives/navigation/back-button.ts +++ b/packages/angular/common/src/directives/navigation/back-button.ts @@ -6,7 +6,7 @@ import { Config } from '../../providers/config'; import { NavController } from '../../providers/nav-controller'; import { ProxyCmp } from '../../utils/proxy'; -import { IonRouterOutlet } from './router-outlet'; +import { IonRouterOutletBase } from './router-outlet'; const BACK_BUTTON_INPUTS = ['color', 'defaultHref', 'disabled', 'icon', 'mode', 'routerAnimation', 'text', 'type']; @@ -31,7 +31,7 @@ export class IonBackButton { protected el: HTMLElement; constructor( - @Optional() private routerOutlet: IonRouterOutlet, + @Optional() private routerOutlet: IonRouterOutletBase, private navCtrl: NavController, private config: Config, private r: ElementRef, diff --git a/packages/angular/common/src/directives/navigation/router-outlet.ts b/packages/angular/common/src/directives/navigation/router-outlet.ts index d0d6bb600c..654748b658 100644 --- a/packages/angular/common/src/directives/navigation/router-outlet.ts +++ b/packages/angular/common/src/directives/navigation/router-outlet.ts @@ -42,7 +42,7 @@ import { RouteView, StackDidChangeEvent, StackWillChangeEvent, getUrl, isTabSwit inputs: ['animated', 'animation', 'mode', 'swipeGesture'], }) // eslint-disable-next-line @angular-eslint/directive-class-suffix -export class IonRouterOutlet implements OnDestroy, OnInit { +export class IonRouterOutletBase implements OnDestroy, OnInit { nativeEl: HTMLIonRouterOutletElement; activatedView: RouteView | null = null; tabsPrefix: string | undefined; @@ -116,7 +116,7 @@ export class IonRouterOutlet implements OnDestroy, OnInit { router: Router, zone: NgZone, activatedRoute: ActivatedRoute, - @SkipSelf() @Optional() readonly parentOutlet?: IonRouterOutlet + @SkipSelf() @Optional() readonly parentOutlet?: IonRouterOutletBase ) { this.nativeEl = elementRef.nativeElement; this.name = name || PRIMARY_OUTLET; @@ -463,19 +463,19 @@ const INPUT_BINDER = new InjectionToken(''); */ @Injectable() class RoutedComponentInputBinder { - private outletDataSubscriptions = new Map(); + private outletDataSubscriptions = new Map(); - bindActivatedRouteToOutletComponent(outlet: IonRouterOutlet): void { + bindActivatedRouteToOutletComponent(outlet: IonRouterOutletBase): void { this.unsubscribeFromRouteData(outlet); this.subscribeToRouteData(outlet); } - unsubscribeFromRouteData(outlet: IonRouterOutlet): void { + unsubscribeFromRouteData(outlet: IonRouterOutletBase): void { this.outletDataSubscriptions.get(outlet)?.unsubscribe(); this.outletDataSubscriptions.delete(outlet); } - private subscribeToRouteData(outlet: IonRouterOutlet) { + private subscribeToRouteData(outlet: IonRouterOutletBase) { const { activatedRoute } = outlet; const dataSubscription = combineLatest([activatedRoute.queryParams, activatedRoute.params, activatedRoute.data]) .pipe( diff --git a/packages/angular/common/src/index.ts b/packages/angular/common/src/index.ts index 6e5c909acf..3ce5ce80c0 100644 --- a/packages/angular/common/src/index.ts +++ b/packages/angular/common/src/index.ts @@ -15,7 +15,7 @@ export { NavParams } from './directives/navigation/nav-params'; export { IonPopover } from './overlays/popover'; export { IonModal } from './overlays/modal'; -export { IonRouterOutlet, provideComponentInputBinding } from './directives/navigation/router-outlet'; +export { IonRouterOutletBase, provideComponentInputBinding } from './directives/navigation/router-outlet'; export { IonBackButton } from './directives/navigation/back-button'; export { diff --git a/packages/angular/common/src/providers/nav-controller.ts b/packages/angular/common/src/providers/nav-controller.ts index aff31b090b..e2d8da0366 100644 --- a/packages/angular/common/src/providers/nav-controller.ts +++ b/packages/angular/common/src/providers/nav-controller.ts @@ -3,7 +3,7 @@ import { Injectable, Optional } from '@angular/core'; import { NavigationExtras, Router, UrlSerializer, UrlTree, NavigationStart } from '@angular/router'; import type { AnimationBuilder, NavDirection, RouterDirection } from '@ionic/core/components'; -import { IonRouterOutlet } from '../directives/navigation/router-outlet'; +import { IonRouterOutletBase } from '../directives/navigation/router-outlet'; import { Platform } from './platform'; @@ -19,7 +19,7 @@ export interface NavigationOptions extends NavigationExtras, AnimationOptions {} providedIn: 'root', }) export class NavController { - private topOutlet?: IonRouterOutlet; + private topOutlet?: IonRouterOutletBase; private direction: 'forward' | 'back' | 'root' | 'auto' = DEFAULT_DIRECTION; private animated?: NavDirection = DEFAULT_ANIMATED; private animationBuilder?: AnimationBuilder; @@ -169,7 +169,7 @@ export class NavController { /** * @internal */ - setTopOutlet(outlet: IonRouterOutlet): void { + setTopOutlet(outlet: IonRouterOutletBase): void { this.topOutlet = outlet; } diff --git a/packages/angular/src/directives/navigation/ion-router-outlet.ts b/packages/angular/src/directives/navigation/ion-router-outlet.ts index c84f5ce23b..79bfc0db7c 100644 --- a/packages/angular/src/directives/navigation/ion-router-outlet.ts +++ b/packages/angular/src/directives/navigation/ion-router-outlet.ts @@ -1,7 +1,7 @@ import { Location } from '@angular/common'; import { Directive, Attribute, Optional, SkipSelf, ElementRef, NgZone } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; -import { IonRouterOutlet as IonRouterOutletBase } from '@ionic/angular/common'; +import { IonRouterOutletBase } from '@ionic/angular/common'; @Directive({ selector: 'ion-router-outlet', diff --git a/packages/angular/standalone/src/navigation/router-outlet.ts b/packages/angular/standalone/src/navigation/router-outlet.ts index d5e6becab2..9b4e191198 100644 --- a/packages/angular/standalone/src/navigation/router-outlet.ts +++ b/packages/angular/standalone/src/navigation/router-outlet.ts @@ -1,7 +1,7 @@ import { Location } from '@angular/common'; import { Directive, Attribute, Optional, SkipSelf, ElementRef, NgZone } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; -import { IonRouterOutlet as IonRouterOutletBase, ProxyCmp } from '@ionic/angular/common'; +import { IonRouterOutletBase, ProxyCmp } from '@ionic/angular/common'; import { defineCustomElement } from '@ionic/core/components/ion-router-outlet.js'; @ProxyCmp({