From db144edea2bb8bcf9a302aada319292670348b4b Mon Sep 17 00:00:00 2001
From: Eduardo Speroni <edusperoni@gmail.com>
Date: Sat, 2 Jul 2022 14:23:13 -0300
Subject: [PATCH] fix: load pages in location instead of in appRef

---
 .../angular/src/lib/cdk/detached-loader.ts    | 29 ++++++++++++++++---
 .../lib/legacy/router/page-router-outlet.ts   |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/packages/angular/src/lib/cdk/detached-loader.ts b/packages/angular/src/lib/cdk/detached-loader.ts
index 31acb85..5574da5 100644
--- a/packages/angular/src/lib/cdk/detached-loader.ts
+++ b/packages/angular/src/lib/cdk/detached-loader.ts
@@ -16,7 +16,9 @@ registerElement('DetachedContainer', () => ProxyViewContainer, {
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
   selector: 'DetachedContainer',
-  template: `<Placeholder #loader></Placeholder><ng-container #vc></ng-container><ng-content></ng-content>`,
+  template: `<Placeholder #loader></Placeholder>
+    <ng-container #vc></ng-container>
+    <ng-content></ng-content>`,
 })
 // eslint-disable-next-line @angular-eslint/component-class-suffix
 export class DetachedLoader implements OnDestroy {
@@ -33,7 +35,7 @@ export class DetachedLoader implements OnDestroy {
     return new TemplatePortal(templateRef, this.vc, context);
   }
 
-  private loadInLocation(componentType: Type<any>): ComponentRef<any> {
+  private loadInAppRef(componentType: Type<any>): ComponentRef<any> {
     const factory = this.resolver.resolveComponentFactory(componentType);
     const componentRef = factory.create(this.containerRef.injector);
     this.appRef.attachView(componentRef.hostView);
@@ -52,6 +54,10 @@ export class DetachedLoader implements OnDestroy {
     return componentRef;
   }
 
+  private loadInLocation(componentType: Type<any>): ComponentRef<any> {
+    return this.vc.createComponent(componentType);
+  }
+
   public ngOnDestroy() {
     this.disposeFunctions.forEach((fn) => fn());
   }
@@ -65,14 +71,22 @@ export class DetachedLoader implements OnDestroy {
    */
   public loadComponent(componentType: Type<any>): Promise<ComponentRef<any>> {
     Trace.write('DetachedLoader.loadComponent', 'detached-loader');
-    return Promise.resolve(this.loadInLocation(componentType));
+    return Promise.resolve(this.loadInAppRef(componentType));
   }
 
   /**
    * @deprecated use Portals
    */
   public loadComponentSync(componentType: Type<any>): ComponentRef<any> {
-    Trace.write('DetachedLoader.loadComponent', 'detached-loader');
+    Trace.write('DetachedLoader.loadComponentSync', 'detached-loader');
+    return this.loadInAppRef(componentType);
+  }
+
+  /**
+   * @deprecated use Portals
+   */
+  public loadComponentInLocation(componentType: Type<any>): ComponentRef<any> {
+    Trace.write('DetachedLoader.loadComponentInLocation', 'detached-loader');
     return this.loadInLocation(componentType);
   }
 
@@ -89,4 +103,11 @@ export class DetachedLoader implements OnDestroy {
     });
     return componentRef;
   }
+
+  /**
+   * @deprecated use Portals
+   */
+  public loadWithFactoryInLocation<T>(factory: ComponentFactory<T>): ComponentRef<T> {
+    return this.vc.createComponent(factory);
+  }
 }
diff --git a/packages/angular/src/lib/legacy/router/page-router-outlet.ts b/packages/angular/src/lib/legacy/router/page-router-outlet.ts
index ce4ddc5..d3511cb 100644
--- a/packages/angular/src/lib/legacy/router/page-router-outlet.ts
+++ b/packages/angular/src/lib/legacy/router/page-router-outlet.ts
@@ -352,7 +352,7 @@ export class PageRouterOutlet implements OnDestroy, RouterOutletContract {
     loaderRef.onDestroy(() => childInjector.destroy());
     this.changeDetector.markForCheck();
 
-    this.activated = loaderRef.instance.loadWithFactory(factory);
+    this.activated = loaderRef.instance.loadWithFactoryInLocation(factory);
     this.activated.changeDetectorRef.detectChanges();
     this.loadComponentInPage(page, this.activated, { activatedRoute });