Merge remote-tracking branch 'origin/main' into sp/sync-feature-7-6-with-main

packages/angular/src/directives/angular-component-lib/utils.ts

@@ -12,6 +12,14 @@ export const proxyInputs = (Cmp: any, inputs: string[]) => {
       set(val: any) {
         this.z.runOutsideAngular(() => (this.el[item] = val));
       },
+      /**
+       * In the event that proxyInputs is called
+       * multiple times re-defining these inputs
+       * will cause an error to be thrown. As a result
+       * we set configurable: true to indicate these
+       * properties can be changed.
+       */
+      configurable: true,
     });
   });
 };

packages/angular/src/directives/navigation/ion-router-outlet.ts

@@ -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);
+  }
+}