-
Notifications
You must be signed in to change notification settings - Fork 13.3k
fix(angular): NavController works with nested outlets #28421
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1777c76
fix(angular): NavController works with nested outlets
liamdebeasi c3ecbba
test(angular): add tests
liamdebeasi 4e98adf
add more context
liamdebeasi 27b177c
Update nested-outlet.spec.ts
liamdebeasi 919e059
Update tabs.spec.ts
liamdebeasi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
25 changes: 23 additions & 2 deletions
25
packages/angular/src/directives/navigation/ion-router-outlet.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,29 @@ | ||
| import { Directive } from '@angular/core'; | ||
| 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'; | ||
|
|
||
| @Directive({ | ||
| selector: 'ion-router-outlet', | ||
| }) | ||
| // eslint-disable-next-line @angular-eslint/directive-class-suffix | ||
| export class IonRouterOutlet extends IonRouterOutletBase {} | ||
| export class IonRouterOutlet extends IonRouterOutletBase { | ||
| /** | ||
| * We need to pass in the correct instance of IonRouterOutlet | ||
| * otherwise parentOutlet will be null in a nested outlet context. | ||
| * This results in APIs such as NavController.pop not working | ||
| * in nested outlets because the parent outlet cannot be found. | ||
| */ | ||
| constructor( | ||
| @Attribute('name') name: string, | ||
| @Optional() @Attribute('tabs') tabs: string, | ||
| commonLocation: Location, | ||
| elementRef: ElementRef, | ||
| router: Router, | ||
| zone: NgZone, | ||
| activatedRoute: ActivatedRoute, | ||
| @SkipSelf() @Optional() readonly parentOutlet?: IonRouterOutlet | ||
| ) { | ||
| super(name, tabs, commonLocation, elementRef, router, zone, activatedRoute, parentOutlet); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
packages/angular/test/base/src/app/lazy/nested-outlet-page/nested-outlet-page.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
packages/angular/test/base/src/app/standalone/tabs/tab1.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,21 @@ | ||
| import { Component } from '@angular/core'; | ||
| import { IonRouterOutlet } from '@ionic/angular/standalone'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-tab-one', | ||
| template: ` | ||
| Tab 1 | ||
|
|
||
| <p id="parent-outlet"> | ||
| Has Parent Outlet: <span>{{ hasParentOutlet }}</span> | ||
| </p> | ||
| `, | ||
| standalone: true, | ||
| }) | ||
| export class TabOneComponent { | ||
| hasParentOutlet = false; | ||
|
|
||
| constructor(private routerOutlet: IonRouterOutlet) { | ||
| this.hasParentOutlet = routerOutlet.parentOutlet != null; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.