@sd-angular/core 19.0.0-beta.6 → 19.0.0-beta.61

package/fesm2022/sd-angular-core-components-tab-router.mjs

@@ -1,19 +1,19 @@
 import * as i0 from '@angular/core';
-import { Injectable, Pipe, Input, ChangeDetectionStrategy, Component, HostListener, ViewChild, createNgModule } from '@angular/core';
-import * as i1 from '@angular/router';
-import { RouterModule, RouterEvent, RoutesRecognized, NavigationEnd, ActivatedRoute } from '@angular/router';
-import * as i5 from '@angular/common';
+import { Injectable, Pipe, Input, ChangeDetectionStrategy, Component, HostListener, ViewChild, signal, inject, Injector, NgModuleFactory, createNgModule } from '@angular/core';
+import * as i2 from '@angular/router';
+import { Router, ActivatedRoute, RouterEvent, RoutesRecognized, NavigationEnd } from '@angular/router';
+import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i3 from '@angular/material/icon';
 import { MatIconModule } from '@angular/material/icon';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { BehaviorSubject, Subscription, Subject } from 'rxjs';
+import { BehaviorSubject, Subscription, isObservable, lastValueFrom, Subject } from 'rxjs';
 import { debounceTime, startWith, map, filter, take } from 'rxjs/operators';
-import * as i2 from '@angular/cdk/drag-drop';
+import { SdNotifyService } from '@sd-angular/core/services/notify';
+import { SdUtilities } from '@sd-angular/core/utilities';
+import * as i2$1 from '@angular/cdk/drag-drop';
 import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
 import { SdBadge } from '@sd-angular/core/components/badge';
-import { SdUtilities } from '@sd-angular/core/utilities';
-import * as i4 from '@sd-angular/core/services/notify';
 
 class SdTabBase {
     #tab;
@@ -114,6 +114,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImpo
                 }]
         }], ctorParameters: () => [] });
 
+class SdTabDecoratorService {
+    static tabRouterService = new BehaviorSubject(undefined);
+    constructor(tabRouterService) {
+        SdTabDecoratorService.tabRouterService.next(tabRouterService);
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabDecoratorService, deps: [{ token: SdTabRouterService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabDecoratorService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabDecoratorService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: () => [{ type: SdTabRouterService }] });
+
 class SdTabInfoPipe {
     tabRouterService;
     constructor(tabRouterService) {
@@ -153,12 +168,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImpo
 class SdTabRouterItemComponent {
     cdRef;
     tabRouterService;
+    router;
     tab;
     #subsctiption = new Subscription();
     tabInfo;
-    constructor(cdRef, tabRouterService) {
+    constructor(cdRef, tabRouterService, router) {
         this.cdRef = cdRef;
         this.tabRouterService = tabRouterService;
+        this.router = router;
     }
     ngOnInit() {
         this.#subsctiption.add(this.tabRouterService.events.pipe(debounceTime(100)).subscribe(() => {
@@ -174,6 +191,13 @@ class SdTabRouterItemComponent {
     ngOnDestroy() {
         this.#subsctiption.unsubscribe();
     }
+    onTabClick = (event) => {
+        event.preventDefault();
+        this.router.navigate([this.tab.url], {
+            queryParams: this.tab.queryParams,
+            state: { switchTab: true },
+        });
+    };
     close = (event) => {
         event.preventDefault();
         event.stopPropagation();
@@ -212,13 +236,13 @@ class SdTabRouterItemComponent {
             this.tabRouterService.close(this.tab);
         }
     };
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterItemComponent, deps: [{ token: i0.ChangeDetectorRef }, { token: SdTabRouterService }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.17", type: SdTabRouterItemComponent, isStandalone: true, selector: "sd-tab-router-item", inputs: { tab: "tab" }, ngImport: i0, template: "<a\n  [routerLink]=\"[tab.url]\"\n  [queryParams]=\"tab.queryParams\"\n  [state]=\"{ switchTab: true }\"\n  class=\"tab-router__item d-flex align-items-center\"\n  style=\"gap: 8px\"\n  [class.tab-router__item--active]=\"tab.isActive\"\n  (mousedown)=\"onMousedown($event)\"\n  (mouseup)=\"onMouseup($event)\">\n  @let info = tabInfo | sdTabInfo: tab;\n  @if (info) {\n    <sd-badge\n      style=\"overflow: hidden;white-space: nowrap;\"\n      [icon]=\"info.icon\"\n      [title]=\"info.icon\"\n      [tooltip]=\"info.tooltip || info.name\"\n      [title]=\"info.name\"\n      [color]=\"info.color\"></sd-badge>\n    <button\n      aria-hidden=\"true\"\n      class=\"tab-router__close d-flex align-items-center justify-content-center ml-auto p-0\"\n      (click)=\"close($event)\"\n      (mousedown)=\"$event.stopPropagation()\">\n      <mat-icon aria-hidden=\"true\" fontIcon=\"close\"></mat-icon>\n    </button>\n  }\n</a>\n", styles: [":host{display:block;overflow:hidden;position:relative;flex:1 1 64px;max-width:240px}:host:after{content:\"\";position:absolute;right:0;top:0;bottom:0;height:16px;width:1px;background:#dde0e5;margin:auto}:host:last-child:after{content:none}:host::ng-deep .tab-router__item sd-badge .c-badge-title{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:184px}.flex-1{flex:1}.tab-router__icon{background-color:#5c6bc0;width:16px;height:16px;line-height:16px;text-align:center;font-size:10px;color:#fff;border-radius:2px;text-transform:uppercase}.tab-router__icon .mat-icon{height:10px;width:10px;font-size:10px}.tab-router__close{color:#757575;outline:none;border:0;background:none;border-radius:50%;height:16px;width:16px}.tab-router__close:hover{background-color:#0000001f}.tab-router__close .mat-icon{font-size:12px;height:12px;width:12px}.tab-router__item{background:#f2f3f4;padding:8px;color:inherit;text-decoration:none;font-size:12px;line-height:16px;overflow:hidden}.tab-router__item:hover{background-color:#fff}.tab-router__name{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.tab-router__item--active{border-radius:8px 8px 0 0;background-color:#fff}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: RouterModule }, { kind: "directive", type: i1.RouterLink, selector: "[routerLink]", inputs: ["target", "queryParams", "fragment", "queryParamsHandling", "state", "info", "relativeTo", "preserveFragment", "skipLocationChange", "replaceUrl", "routerLink"] }, { kind: "ngmodule", type: MatIconModule }, { kind: "component", type: i3.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "component", type: SdBadge, selector: "sd-badge", inputs: ["type", "color", "primary", "secondary", "success", "info", "warning", "error", "fontSet", "title", "description", "tooltip", "icon", "size"], outputs: ["sdClick"] }, { kind: "pipe", type: SdTabInfoPipe, name: "sdTabInfo" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterItemComponent, deps: [{ token: i0.ChangeDetectorRef }, { token: SdTabRouterService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.17", type: SdTabRouterItemComponent, isStandalone: true, selector: "sd-tab-router-item", inputs: { tab: "tab" }, ngImport: i0, template: "<a\r\n  [href]=\"[tab.url]\"\r\n  class=\"tab-router__item d-flex align-items-center gap-8\"\r\n  [class.tab-router__item--active]=\"tab.isActive\"\r\n  (click)=\"onTabClick($event)\"\r\n  (mousedown)=\"onMousedown($event)\"\r\n  (mouseup)=\"onMouseup($event)\">\r\n  @let info = tabInfo | sdTabInfo: tab;\r\n  @if (info) {\r\n    <sd-badge\r\n      style=\"overflow: hidden;white-space: nowrap;\"\r\n      [icon]=\"info.icon\"\r\n      [title]=\"info.icon\"\r\n      [tooltip]=\"info.tooltip || info.name\"\r\n      [title]=\"info.name\"\r\n      [color]=\"info.color\"\r\n      (click)=\"onTabClick($event)\"></sd-badge>\r\n    <button\r\n      aria-hidden=\"true\"\r\n      class=\"tab-router__close d-flex align-items-center justify-content-center ml-auto p-0\"\r\n      (click)=\"close($event)\"\r\n      (mousedown)=\"$event.stopPropagation()\">\r\n      <mat-icon aria-hidden=\"true\" fontIcon=\"close\"></mat-icon>\r\n    </button>\r\n  }\r\n</a>\r\n", styles: [":host{display:block;overflow:hidden;position:relative;flex:1 1 64px;max-width:240px}:host:after{content:\"\";position:absolute;right:0;top:0;bottom:0;height:16px;width:1px;background:#dde0e5;margin:auto}:host:last-child:after{content:none}:host::ng-deep .tab-router__item sd-badge .c-badge-title{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:184px}.flex-1{flex:1}.tab-router__icon{background-color:#5c6bc0;width:16px;height:16px;line-height:16px;text-align:center;font-size:10px;color:#fff;border-radius:2px;text-transform:uppercase}.tab-router__icon .mat-icon{height:10px;width:10px;font-size:10px}.tab-router__close{color:#757575;outline:none;border:0;background:none;border-radius:50%;height:16px;width:16px}.tab-router__close:hover{background-color:#0000001f}.tab-router__close .mat-icon{font-size:12px;height:12px;width:12px}.tab-router__item{background:#f2f3f4;padding:8px;color:inherit;text-decoration:none;font-size:12px;line-height:16px;overflow:hidden}.tab-router__item:hover{background-color:#fff}.tab-router__name{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.tab-router__item--active{border-radius:8px 8px 0 0;background-color:#fff}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: MatIconModule }, { kind: "component", type: i3.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "component", type: SdBadge, selector: "sd-badge", inputs: ["type", "color", "primary", "secondary", "success", "info", "warning", "error", "fontSet", "title", "description", "tooltip", "icon", "size"], outputs: ["click"] }, { kind: "pipe", type: SdTabInfoPipe, name: "sdTabInfo" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterItemComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'sd-tab-router-item', changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [CommonModule, RouterModule, MatIconModule, SdBadge, SdTabInfoPipe], template: "<a\n  [routerLink]=\"[tab.url]\"\n  [queryParams]=\"tab.queryParams\"\n  [state]=\"{ switchTab: true }\"\n  class=\"tab-router__item d-flex align-items-center\"\n  style=\"gap: 8px\"\n  [class.tab-router__item--active]=\"tab.isActive\"\n  (mousedown)=\"onMousedown($event)\"\n  (mouseup)=\"onMouseup($event)\">\n  @let info = tabInfo | sdTabInfo: tab;\n  @if (info) {\n    <sd-badge\n      style=\"overflow: hidden;white-space: nowrap;\"\n      [icon]=\"info.icon\"\n      [title]=\"info.icon\"\n      [tooltip]=\"info.tooltip || info.name\"\n      [title]=\"info.name\"\n      [color]=\"info.color\"></sd-badge>\n    <button\n      aria-hidden=\"true\"\n      class=\"tab-router__close d-flex align-items-center justify-content-center ml-auto p-0\"\n      (click)=\"close($event)\"\n      (mousedown)=\"$event.stopPropagation()\">\n      <mat-icon aria-hidden=\"true\" fontIcon=\"close\"></mat-icon>\n    </button>\n  }\n</a>\n", styles: [":host{display:block;overflow:hidden;position:relative;flex:1 1 64px;max-width:240px}:host:after{content:\"\";position:absolute;right:0;top:0;bottom:0;height:16px;width:1px;background:#dde0e5;margin:auto}:host:last-child:after{content:none}:host::ng-deep .tab-router__item sd-badge .c-badge-title{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:184px}.flex-1{flex:1}.tab-router__icon{background-color:#5c6bc0;width:16px;height:16px;line-height:16px;text-align:center;font-size:10px;color:#fff;border-radius:2px;text-transform:uppercase}.tab-router__icon .mat-icon{height:10px;width:10px;font-size:10px}.tab-router__close{color:#757575;outline:none;border:0;background:none;border-radius:50%;height:16px;width:16px}.tab-router__close:hover{background-color:#0000001f}.tab-router__close .mat-icon{font-size:12px;height:12px;width:12px}.tab-router__item{background:#f2f3f4;padding:8px;color:inherit;text-decoration:none;font-size:12px;line-height:16px;overflow:hidden}.tab-router__item:hover{background-color:#fff}.tab-router__name{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.tab-router__item--active{border-radius:8px 8px 0 0;background-color:#fff}\n"] }]
-        }], ctorParameters: () => [{ type: i0.ChangeDetectorRef }, { type: SdTabRouterService }], propDecorators: { tab: [{
+            args: [{ selector: 'sd-tab-router-item', changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [CommonModule, MatIconModule, SdBadge, SdTabInfoPipe], template: "<a\r\n  [href]=\"[tab.url]\"\r\n  class=\"tab-router__item d-flex align-items-center gap-8\"\r\n  [class.tab-router__item--active]=\"tab.isActive\"\r\n  (click)=\"onTabClick($event)\"\r\n  (mousedown)=\"onMousedown($event)\"\r\n  (mouseup)=\"onMouseup($event)\">\r\n  @let info = tabInfo | sdTabInfo: tab;\r\n  @if (info) {\r\n    <sd-badge\r\n      style=\"overflow: hidden;white-space: nowrap;\"\r\n      [icon]=\"info.icon\"\r\n      [title]=\"info.icon\"\r\n      [tooltip]=\"info.tooltip || info.name\"\r\n      [title]=\"info.name\"\r\n      [color]=\"info.color\"\r\n      (click)=\"onTabClick($event)\"></sd-badge>\r\n    <button\r\n      aria-hidden=\"true\"\r\n      class=\"tab-router__close d-flex align-items-center justify-content-center ml-auto p-0\"\r\n      (click)=\"close($event)\"\r\n      (mousedown)=\"$event.stopPropagation()\">\r\n      <mat-icon aria-hidden=\"true\" fontIcon=\"close\"></mat-icon>\r\n    </button>\r\n  }\r\n</a>\r\n", styles: [":host{display:block;overflow:hidden;position:relative;flex:1 1 64px;max-width:240px}:host:after{content:\"\";position:absolute;right:0;top:0;bottom:0;height:16px;width:1px;background:#dde0e5;margin:auto}:host:last-child:after{content:none}:host::ng-deep .tab-router__item sd-badge .c-badge-title{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width:184px}.flex-1{flex:1}.tab-router__icon{background-color:#5c6bc0;width:16px;height:16px;line-height:16px;text-align:center;font-size:10px;color:#fff;border-radius:2px;text-transform:uppercase}.tab-router__icon .mat-icon{height:10px;width:10px;font-size:10px}.tab-router__close{color:#757575;outline:none;border:0;background:none;border-radius:50%;height:16px;width:16px}.tab-router__close:hover{background-color:#0000001f}.tab-router__close .mat-icon{font-size:12px;height:12px;width:12px}.tab-router__item{background:#f2f3f4;padding:8px;color:inherit;text-decoration:none;font-size:12px;line-height:16px;overflow:hidden}.tab-router__item:hover{background-color:#fff}.tab-router__name{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.tab-router__item--active{border-radius:8px 8px 0 0;background-color:#fff}\n"] }]
+        }], ctorParameters: () => [{ type: i0.ChangeDetectorRef }, { type: SdTabRouterService }, { type: i2.Router }], propDecorators: { tab: [{
                 type: Input,
                 args: [{ required: true }]
             }] } });
@@ -253,7 +277,7 @@ class SdTabRouterNavComponent {
         moveItemInArray(this.tabs, event.previousIndex, event.currentIndex);
     };
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterNavComponent, deps: [{ token: i0.ChangeDetectorRef }, { token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.17", type: SdTabRouterNavComponent, isStandalone: true, selector: "sd-tab-router-nav", inputs: { tabs: "tabs" }, host: { listeners: { "window:resize": "onResize($event)" } }, viewQueries: [{ propertyName: "tabRouterNav", first: true, predicate: ["tabRouterNav"], descendants: true }], ngImport: i0, template: "<div\n  #tabRouterNav\n  cdkDropList\n  cdkDropListLockAxis=\"x\"\n  cdkDropListOrientation=\"horizontal\"\n  (cdkDropListDropped)=\"onDrop($event)\"\n  class=\"tab-router__nav tab-router__nav--{{ mode }} d-flex align-items-center flex-nowrap\"\n  [class.d-none]=\"tabs.length > 1\">\n  <ng-container *ngFor=\"let tab of tabs\">\n    <sd-tab-router-item [tab]=\"tab\" cdkDrag [cdkDragBoundary]=\"elementRef?.nativeElement\"></sd-tab-router-item>\n  </ng-container>\n</div>\n", styles: [".tab-router__nav{background:#f9f9f9;overflow:hidden}.tab-router__nav--compact::ng-deep .tab-router__name{display:none}.tab-router__nav--compact::ng-deep .tab-router__icon{margin:0!important}.tab-router__nav--compact::ng-deep .tab-router__item--active{min-width:240px}.tab-router__nav--compact::ng-deep .tab-router__item--active .tab-router__icon{margin-right:8px!important}.tab-router__nav--compact::ng-deep .tab-router__item--active .tab-router__name{display:-webkit-box}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i5.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "ngmodule", type: DragDropModule }, { kind: "directive", type: i2.CdkDropList, selector: "[cdkDropList], cdk-drop-list", inputs: ["cdkDropListConnectedTo", "cdkDropListData", "cdkDropListOrientation", "id", "cdkDropListLockAxis", "cdkDropListDisabled", "cdkDropListSortingDisabled", "cdkDropListEnterPredicate", "cdkDropListSortPredicate", "cdkDropListAutoScrollDisabled", "cdkDropListAutoScrollStep", "cdkDropListElementContainer"], outputs: ["cdkDropListDropped", "cdkDropListEntered", "cdkDropListExited", "cdkDropListSorted"], exportAs: ["cdkDropList"] }, { kind: "directive", type: i2.CdkDrag, selector: "[cdkDrag]", inputs: ["cdkDragData", "cdkDragLockAxis", "cdkDragRootElement", "cdkDragBoundary", "cdkDragStartDelay", "cdkDragFreeDragPosition", "cdkDragDisabled", "cdkDragConstrainPosition", "cdkDragPreviewClass", "cdkDragPreviewContainer", "cdkDragScale"], outputs: ["cdkDragStarted", "cdkDragReleased", "cdkDragEnded", "cdkDragEntered", "cdkDragExited", "cdkDragDropped", "cdkDragMoved"], exportAs: ["cdkDrag"] }, { kind: "component", type: SdTabRouterItemComponent, selector: "sd-tab-router-item", inputs: ["tab"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.17", type: SdTabRouterNavComponent, isStandalone: true, selector: "sd-tab-router-nav", inputs: { tabs: "tabs" }, host: { listeners: { "window:resize": "onResize($event)" } }, viewQueries: [{ propertyName: "tabRouterNav", first: true, predicate: ["tabRouterNav"], descendants: true }], ngImport: i0, template: "<div\n  #tabRouterNav\n  cdkDropList\n  cdkDropListLockAxis=\"x\"\n  cdkDropListOrientation=\"horizontal\"\n  (cdkDropListDropped)=\"onDrop($event)\"\n  class=\"tab-router__nav tab-router__nav--{{ mode }} d-flex align-items-center flex-nowrap\"\n  [class.d-none]=\"tabs.length > 1\">\n  <ng-container *ngFor=\"let tab of tabs\">\n    <sd-tab-router-item [tab]=\"tab\" cdkDrag [cdkDragBoundary]=\"elementRef?.nativeElement\"></sd-tab-router-item>\n  </ng-container>\n</div>\n", styles: [".tab-router__nav{background:#f9f9f9;overflow:hidden}.tab-router__nav--compact::ng-deep .tab-router__name{display:none}.tab-router__nav--compact::ng-deep .tab-router__icon{margin:0!important}.tab-router__nav--compact::ng-deep .tab-router__item--active{min-width:240px}.tab-router__nav--compact::ng-deep .tab-router__item--active .tab-router__icon{margin-right:8px!important}.tab-router__nav--compact::ng-deep .tab-router__item--active .tab-router__name{display:-webkit-box}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "ngmodule", type: DragDropModule }, { kind: "directive", type: i2$1.CdkDropList, selector: "[cdkDropList], cdk-drop-list", inputs: ["cdkDropListConnectedTo", "cdkDropListData", "cdkDropListOrientation", "id", "cdkDropListLockAxis", "cdkDropListDisabled", "cdkDropListSortingDisabled", "cdkDropListEnterPredicate", "cdkDropListSortPredicate", "cdkDropListAutoScrollDisabled", "cdkDropListAutoScrollStep", "cdkDropListElementContainer"], outputs: ["cdkDropListDropped", "cdkDropListEntered", "cdkDropListExited", "cdkDropListSorted"], exportAs: ["cdkDropList"] }, { kind: "directive", type: i2$1.CdkDrag, selector: "[cdkDrag]", inputs: ["cdkDragData", "cdkDragLockAxis", "cdkDragRootElement", "cdkDragBoundary", "cdkDragStartDelay", "cdkDragFreeDragPosition", "cdkDragDisabled", "cdkDragConstrainPosition", "cdkDragPreviewClass", "cdkDragPreviewContainer", "cdkDragScale"], outputs: ["cdkDragStarted", "cdkDragReleased", "cdkDragEnded", "cdkDragEntered", "cdkDragExited", "cdkDragDropped", "cdkDragMoved"], exportAs: ["cdkDrag"] }, { kind: "component", type: SdTabRouterItemComponent, selector: "sd-tab-router-item", inputs: ["tab"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterNavComponent, decorators: [{
             type: Component,
@@ -268,64 +292,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImpo
                 args: ['window:resize', ['$event']]
             }] } });
 
-class SdTabDecoratorService {
-    static tabRouterService = new BehaviorSubject(undefined);
-    constructor(tabRouterService) {
-        SdTabDecoratorService.tabRouterService.next(tabRouterService);
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabDecoratorService, deps: [{ token: SdTabRouterService }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabDecoratorService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabDecoratorService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: SdTabRouterService }] });
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 class SdTabRouterOutletComponent {
-    router;
-    activatedRoute;
-    cd;
-    injector;
-    tabDecoratorService;
-    tabRouterService;
-    sdNotifyService;
     tabRouterNav;
-    tabs = [];
+    tabs = signal([]);
+    #router = inject(Router);
+    #activatedRoute = inject(ActivatedRoute);
+    #injector = inject(Injector);
+    #tabRouterService = inject(SdTabRouterService);
+    #sdNotifyService = inject(SdNotifyService);
+    #tabDecoratorService = inject(SdTabDecoratorService);
     #rootRoute;
     #subscription = new Subscription();
     #firstLoad = true;
-    constructor(router, activatedRoute, cd, injector, tabDecoratorService, // KHÔNG XÓA
-    tabRouterService, sdNotifyService) {
-        this.router = router;
-        this.activatedRoute = activatedRoute;
-        this.cd = cd;
-        this.injector = injector;
-        this.tabDecoratorService = tabDecoratorService;
-        this.tabRouterService = tabRouterService;
-        this.sdNotifyService = sdNotifyService;
-        this.#subscription.add(router.events
-            .pipe(map((event) => (event instanceof RouterEvent ? event : event.routerEvent)), filter(event => {
-            return event instanceof RoutesRecognized || event instanceof NavigationEnd;
-        }))
+    constructor() {
+        this.#subscription.add(this.#router.events
+            .pipe(map((event) => (event instanceof RouterEvent ? event : event.routerEvent)), filter(event => event instanceof RoutesRecognized || event instanceof NavigationEnd))
             .subscribe(async (event) => {
             if (this.#firstLoad && event instanceof NavigationEnd) {
                 this.#firstLoad = false;
-                const route = this.#getActivatedRouteSnapshot(this.activatedRoute.snapshot);
-                this.#rootRoute = this.router.routerState.root;
+                const route = this.#getActivatedRouteSnapshot(this.#activatedRoute.snapshot);
+                this.#rootRoute = this.#router.routerState.root;
                 await this.#activeRoute(event.urlAfterRedirects || event.url, route);
                 return;
             }
             if (!this.#firstLoad && event instanceof RoutesRecognized) {
                 const route = this.#getActivatedRouteSnapshot(event.state.root);
-                this.#rootRoute = this.router.routerState.root;
+                this.#rootRoute = this.#router.routerState.root;
                 await this.#activeRoute(event.urlAfterRedirects || event.url, route);
             }
         }));
-        this.#subscription.add(tabRouterService.actions.subscribe((event) => {
-            if (event && event.type === 'close') {
+        this.#subscription.add(this.#tabRouterService.actions.subscribe((event) => {
+            if (event?.type === 'close') {
                 this.#closeTab(event.tab);
             }
         }));
@@ -333,61 +331,42 @@ class SdTabRouterOutletComponent {
     ngOnDestroy() {
         this.#subscription.unsubscribe();
     }
-    tabTrackBy = (index, tab) => {
-        return tab.key;
-    };
+    tabTrackBy = (index, tab) => tab.key;
     #closeTab = (tab) => {
+        const currentTabs = this.tabs();
         const { isActive, key: activeKey } = tab;
         if (isActive) {
-            const activeIndex = this.tabs.findIndex(({ key }) => key === activeKey);
-            const nextTab = this.tabs[activeIndex + 1] || this.tabs[activeIndex - 1];
+            const activeIndex = currentTabs.findIndex(({ key }) => key === activeKey);
+            const nextTab = currentTabs[activeIndex + 1] || currentTabs[activeIndex - 1];
+            this.tabs.set(currentTabs.filter(({ key }) => key !== activeKey));
             if (nextTab) {
-                const { url: nextUrl } = nextTab;
-                const nextQueryParams = {
-                    ...(nextTab.queryParams || {}),
-                };
-                this.tabs = this.tabs.filter(({ key }) => key !== activeKey);
-                this.router.navigate([nextUrl], {
-                    queryParams: nextQueryParams,
-                    state: {
-                        switchTab: true,
-                    },
+                this.#router.navigate([nextTab.url], {
+                    queryParams: { ...(nextTab.queryParams || {}) },
+                    state: { switchTab: true },
                 });
             }
             else {
-                this.tabs = this.tabs.filter(({ key }) => key !== activeKey);
-                this.router.navigateByUrl('/', {
-                    state: {
-                        switchTab: true,
-                    },
-                });
+                this.#router.navigateByUrl('/', { state: { switchTab: true } });
             }
         }
         else {
-            this.tabs = this.tabs.filter(({ key }) => key !== tab.key);
+            this.tabs.set(currentTabs.filter(({ key }) => key !== tab.key));
             this.tabRouterNav?.checkUI();
-            this.cd.markForCheck();
         }
     };
     #activeRoute = async (fullUrl, route) => {
-        if (!route?.component) {
+        if (!route?.component)
             return;
-        }
         const component = route.component;
-        const queryParams = {
-            ...(route.queryParams || {}),
-        };
-        const params = {
-            ...(route.params || {}),
-        };
-        const data = {
-            ...(route.data || {}),
-        };
+        const queryParams = { ...(route.queryParams || {}) };
+        const params = { ...(route.params || {}) };
+        const data = { ...(route.data || {}) };
         const [url] = fullUrl.split('?');
         const key = SdUtilities.hash({ url, queryParams });
         let existedIndex = -1;
         let activatedIndex = -1;
-        this.tabs.forEach((tab, index) => {
+        const currentTabs = this.tabs();
+        currentTabs.forEach((tab, index) => {
             if (tab.key === key) {
                 tab.isActive = true;
                 existedIndex = index;
@@ -395,179 +374,126 @@ class SdTabRouterOutletComponent {
             else {
                 if (tab.isActive) {
                     activatedIndex = index;
-                    this.tabRouterService.pushEvent(tab, SdTabDeactivated);
+                    this.#tabRouterService.pushEvent(tab, SdTabDeactivated);
                 }
                 tab.isActive = false;
             }
         });
-        const currentNavigation = this.router.getCurrentNavigation();
-        // Switch tab sẽ ko re-render lại trang
+        const currentNavigation = this.#router.getCurrentNavigation();
         const switchTab = currentNavigation?.extras?.state?.['switchTab'];
-        // Replace tab sẽ close trang hiện tại
         const replaceTab = currentNavigation?.extras?.state?.['replaceTab'];
+        // --- XỬ LÝ INJECTOR VÀ FIX LỖI TYPE TS(2345) ---
+        const getBestInjector = async (snapshot) => {
+            // 1. Nếu là Standalone Route, lấy injector từ chính route config (đã được router resolve)
+            const routeInjector = snapshot._resolvedGui || snapshot.routeConfig?._injector;
+            if (routeInjector)
+                return routeInjector;
+            // 2. Xử lý NgModule (Lazy load kiểu cũ)
+            const loadChildren = snapshot.parent?.routeConfig?.loadChildren;
+            if (typeof loadChildren === 'function') {
+                let loaded = await loadChildren();
+                // Unwrap Observable
+                if (isObservable(loaded)) {
+                    loaded = await lastValueFrom(loaded);
+                }
+                // Unwrap Default Export (ES Module)
+                if (loaded && typeof loaded === 'object' && 'default' in loaded) {
+                    loaded = loaded.default;
+                }
+                // Nếu là NgModuleFactory (Angular cũ hơn)
+                if (loaded instanceof NgModuleFactory) {
+                    return loaded.create(this.#injector).injector;
+                }
+                // Nếu là Type (Class NgModule) - Đây là chỗ fix lỗi TS(2345)
+                if (typeof loaded === 'function' && !Array.isArray(loaded)) {
+                    try {
+                        return createNgModule(loaded, this.#injector).injector;
+                    }
+                    catch {
+                        return this.#injector;
+                    }
+                }
+            }
+            return this.#injector;
+        };
+        const finalInjector = await getBestInjector(route);
+        const activatedRoute = this.#getActivatedRoute(this.#rootRoute, component);
+        const newTab = {
+            key,
+            component,
+            injector: new SdOutletInjector(activatedRoute, finalInjector),
+            isActive: true,
+            url,
+            params,
+            queryParams,
+            data,
+            tabInfoChanges: new Subject(),
+        };
         if (existedIndex >= 0) {
-            const existedTab = this.tabs[existedIndex];
+            const updatedTabs = [...currentTabs];
             if (replaceTab && activatedIndex >= 0) {
-                if (activatedIndex >= 0) {
-                    this.tabs.splice(activatedIndex, 1);
-                }
+                updatedTabs.splice(activatedIndex, 1);
             }
             if (switchTab) {
-                this.tabRouterService.setCurrentTab(existedTab);
-                this.tabRouterService.pushEvent(existedTab, SdTabActivated);
+                this.#tabRouterService.setCurrentTab(updatedTabs[existedIndex]);
+                this.#tabRouterService.pushEvent(updatedTabs[existedIndex], SdTabActivated);
             }
             else {
-                if (typeof route?.parent?.routeConfig?.loadChildren === 'function') {
-                    const module = (await route.parent.routeConfig.loadChildren());
-                    const moduleRef = createNgModule(module, this.injector);
-                    const activatedRoute = this.#getActivatedRoute(this.#rootRoute, component);
-                    const tab = {
-                        key,
-                        component,
-                        injector: new SdOutletInjector(activatedRoute, moduleRef),
-                        isActive: true,
-                        url,
-                        params,
-                        queryParams,
-                        data,
-                        tabInfoChanges: new Subject(),
-                    };
-                    this.tabs[this.tabs.indexOf(existedTab)] = tab;
-                }
+                updatedTabs[existedIndex] = newTab;
             }
+            this.tabs.set(updatedTabs);
         }
         else {
-            if (typeof route?.parent?.routeConfig?.loadChildren === 'function') {
-                const module = (await route.parent.routeConfig.loadChildren());
-                const moduleRef = createNgModule(module, this.injector);
-                const activatedRoute = this.#getActivatedRoute(this.#rootRoute, component);
-                const tab = {
-                    key,
-                    component,
-                    injector: new SdOutletInjector(activatedRoute, moduleRef),
-                    isActive: true,
-                    url,
-                    params,
-                    queryParams,
-                    data,
-                    tabInfoChanges: new Subject(),
-                };
-                this.tabRouterService.setCurrentTab(tab);
-                if (activatedIndex >= 0 && replaceTab) {
-                    this.tabs.splice(activatedIndex, 1);
-                }
-                this.tabs.push(tab);
-                // if (existedIndex >= 0 && !switchTab) {
-                //   this.tabs[existedIndex] = tab;
-                // } else {
-                //   this.tabs.push(tab);
-                // }
+            const updatedTabs = [...currentTabs];
+            this.#tabRouterService.setCurrentTab(newTab);
+            if (activatedIndex >= 0 && replaceTab) {
+                updatedTabs.splice(activatedIndex, 1);
             }
-            this.tabRouterNav?.checkUI();
-            if (this.tabs.length > 10) {
-                this.sdNotifyService.warning('Bạn đã mở quá nhiều tab. Vui lòng tắt các tab không dùng để hệ thống hoạt động tốt hơn.');
+            this.tabs.set([...updatedTabs, newTab]);
+            if (this.tabs().length > 10) {
+                this.#sdNotifyService.warning('Bạn đã mở quá nhiều tab.');
             }
-            // if (this.tabs.length > 15) {
-            //   this.tabs.splice(0, this.tabs.length - 10);
-            // }
         }
-        // if (existedIndex >= 0 && switchTab) {
-        //   const existedTab = this.tabs[existedIndex];
-        //   this.tabRouterService.setCurrentTab(existedTab);
-        //   this.tabRouterService.pushEvent(existedTab, SdTabActivated);
-        // } else {
-        //   if (typeof route?.parent?.routeConfig?.loadChildren === 'function') {
-        //     const module = await route.parent.routeConfig.loadChildren();
-        //     const factory = await this.compiler.compileModuleAsync(module);
-        //     const injector = factory.create(this.injector);
-        //     const activatedRoute = this.#getActivatedRoute(
-        //       this.#rootRoute,
-        //       component
-        //     );
-        //     const tab = {
-        //       key,
-        //       component,
-        //       injector: new SdOutletInjector(activatedRoute, injector),
-        //       isActive: true,
-        //       name: url,
-        //       url,
-        //       params,
-        //       queryParams,
-        //       data
-        //     };
-        //     this.tabRouterService.setCurrentTab(tab);
-        //     if (activatedIndex >= 0 && replaceTab) {
-        //       this.tabs.splice(activatedIndex, 1);
-        //     }
-        //     if (existedIndex >= 0 && !switchTab) {
-        //       this.tabs[existedIndex] = tab;
-        //     } else {
-        //       this.tabs.push(tab);
-        //     }
-        //   }
-        //   this.tabRouterNav?.checkUI();
-        //   if (this.tabs.length > 10) {
-        //     this.sdNotifyService.notify.warning(
-        //       'Bạn đã mở quá nhiều tab. Vui lòng tắt các tab không dùng để hệ thống hoạt động tốt hơn.'
-        //     );
-        //   }
-        //   if (this.tabs.length > 15) {
-        //     this.tabs.splice(0, this.tabs.length - 10);
-        //   }
-        // }
-        this.cd.markForCheck();
+        this.tabRouterNav?.checkUI();
     };
-    #getActivatedRouteSnapshot = (activatedRouteSnapshot) => {
-        if (!activatedRouteSnapshot) {
-            return null;
-        }
-        while (activatedRouteSnapshot.firstChild) {
-            activatedRouteSnapshot = activatedRouteSnapshot.firstChild;
-        }
-        return activatedRouteSnapshot;
+    #getActivatedRouteSnapshot = (snapshot) => {
+        let node = snapshot;
+        while (node.firstChild)
+            node = node.firstChild;
+        return node;
     };
     #getActivatedRoute = (activatedRoute, component) => {
-        if (!activatedRoute) {
-            return null;
-        }
-        if (activatedRoute.component && activatedRoute.component === component) {
+        if (activatedRoute.component === component)
             return activatedRoute;
-        }
-        while (activatedRoute.firstChild) {
-            activatedRoute = activatedRoute.firstChild;
-            if (activatedRoute.component && activatedRoute.component === component) {
-                return activatedRoute;
-            }
+        for (const child of activatedRoute.children) {
+            const result = this.#getActivatedRoute(child, component);
+            if (result)
+                return result;
         }
         return null;
     };
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterOutletComponent, deps: [{ token: i1.Router }, { token: i1.ActivatedRoute }, { token: i0.ChangeDetectorRef }, { token: i0.Injector }, { token: SdTabDecoratorService }, { token: SdTabRouterService }, { token: i4.SdNotifyService }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.17", type: SdTabRouterOutletComponent, isStandalone: true, selector: "sd-tab-router-outlet", viewQueries: [{ propertyName: "tabRouterNav", first: true, predicate: ["tabRouterNav"], descendants: true }], ngImport: i0, template: "<sd-tab-router-nav [tabs]=\"tabs\" #tabRouterNav></sd-tab-router-nav>\n\n<div class=\"tab-router__list\">\n  <ng-container *ngFor=\"let tab of tabs; trackBy: tabTrackBy\">\n    <div class=\"tab-router__pane\" [class.active]=\"tab.isActive\" [id]=\"tab.key\">\n      <div class=\"tab-router__content\">\n        <ng-container *ngComponentOutlet=\"tab.component; injector: tab.injector\"></ng-container>\n      </div>\n    </div>\n  </ng-container>\n</div>\n", styles: [":host{display:flex;flex-direction:column;width:100%;height:calc(100vh - 64px)}:host ::ng-deep .sd-loading{max-width:100%;max-height:100%}.tab-router__list{flex:1}.tab-router__pane{display:none;position:relative;height:100%;width:100%}.tab-router__pane.active{display:block}.tab-router__content{position:absolute;inset:0;overflow:auto;height:100%;width:100%}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i5.NgComponentOutlet, selector: "[ngComponentOutlet]", inputs: ["ngComponentOutlet", "ngComponentOutletInputs", "ngComponentOutletInjector", "ngComponentOutletContent", "ngComponentOutletNgModule", "ngComponentOutletNgModuleFactory"], exportAs: ["ngComponentOutlet"] }, { kind: "directive", type: i5.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "ngmodule", type: MatIconModule }, { kind: "ngmodule", type: MatTooltipModule }, { kind: "component", type: SdTabRouterNavComponent, selector: "sd-tab-router-nav", inputs: ["tabs"] }] });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterOutletComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.17", type: SdTabRouterOutletComponent, isStandalone: true, selector: "sd-tab-router-outlet", viewQueries: [{ propertyName: "tabRouterNav", first: true, predicate: ["tabRouterNav"], descendants: true }], ngImport: i0, template: "<sd-tab-router-nav [tabs]=\"tabs()\" #tabRouterNav></sd-tab-router-nav>\n\n<div class=\"tab-router__list\">\n  @for (tab of tabs(); track tab.key) {\n    <div class=\"tab-router__pane\" [class.active]=\"tab.isActive\" [id]=\"tab.key\">\n      <div class=\"tab-router__content\">\n        <ng-container *ngComponentOutlet=\"tab.component; injector: tab.injector\"></ng-container>\n      </div>\n    </div>\n  } @empty {\n    <div class=\"tab-router__empty\">\n      </div>\n  }\n</div>", styles: [":host{display:flex;flex-direction:column;width:100%;height:calc(100vh - 64px)}:host ::ng-deep .sd-loading{max-width:100%;max-height:100%}.tab-router__list{flex:1}.tab-router__pane{display:none;position:relative;height:100%;width:100%}.tab-router__pane.active{display:block}.tab-router__content{position:absolute;inset:0;overflow:auto;height:100%;width:100%}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1.NgComponentOutlet, selector: "[ngComponentOutlet]", inputs: ["ngComponentOutlet", "ngComponentOutletInputs", "ngComponentOutletInjector", "ngComponentOutletContent", "ngComponentOutletNgModule", "ngComponentOutletNgModuleFactory"], exportAs: ["ngComponentOutlet"] }, { kind: "ngmodule", type: MatIconModule }, { kind: "ngmodule", type: MatTooltipModule }, { kind: "component", type: SdTabRouterNavComponent, selector: "sd-tab-router-nav", inputs: ["tabs"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: SdTabRouterOutletComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'sd-tab-router-outlet', standalone: true, imports: [CommonModule, MatIconModule, MatTooltipModule, SdTabRouterNavComponent], template: "<sd-tab-router-nav [tabs]=\"tabs\" #tabRouterNav></sd-tab-router-nav>\n\n<div class=\"tab-router__list\">\n  <ng-container *ngFor=\"let tab of tabs; trackBy: tabTrackBy\">\n    <div class=\"tab-router__pane\" [class.active]=\"tab.isActive\" [id]=\"tab.key\">\n      <div class=\"tab-router__content\">\n        <ng-container *ngComponentOutlet=\"tab.component; injector: tab.injector\"></ng-container>\n      </div>\n    </div>\n  </ng-container>\n</div>\n", styles: [":host{display:flex;flex-direction:column;width:100%;height:calc(100vh - 64px)}:host ::ng-deep .sd-loading{max-width:100%;max-height:100%}.tab-router__list{flex:1}.tab-router__pane{display:none;position:relative;height:100%;width:100%}.tab-router__pane.active{display:block}.tab-router__content{position:absolute;inset:0;overflow:auto;height:100%;width:100%}\n"] }]
-        }], ctorParameters: () => [{ type: i1.Router }, { type: i1.ActivatedRoute }, { type: i0.ChangeDetectorRef }, { type: i0.Injector }, { type: SdTabDecoratorService }, { type: SdTabRouterService }, { type: i4.SdNotifyService }], propDecorators: { tabRouterNav: [{
+            args: [{ selector: 'sd-tab-router-outlet', standalone: true, imports: [CommonModule, MatIconModule, MatTooltipModule, SdTabRouterNavComponent], template: "<sd-tab-router-nav [tabs]=\"tabs()\" #tabRouterNav></sd-tab-router-nav>\n\n<div class=\"tab-router__list\">\n  @for (tab of tabs(); track tab.key) {\n    <div class=\"tab-router__pane\" [class.active]=\"tab.isActive\" [id]=\"tab.key\">\n      <div class=\"tab-router__content\">\n        <ng-container *ngComponentOutlet=\"tab.component; injector: tab.injector\"></ng-container>\n      </div>\n    </div>\n  } @empty {\n    <div class=\"tab-router__empty\">\n      </div>\n  }\n</div>", styles: [":host{display:flex;flex-direction:column;width:100%;height:calc(100vh - 64px)}:host ::ng-deep .sd-loading{max-width:100%;max-height:100%}.tab-router__list{flex:1}.tab-router__pane{display:none;position:relative;height:100%;width:100%}.tab-router__pane.active{display:block}.tab-router__content{position:absolute;inset:0;overflow:auto;height:100%;width:100%}\n"] }]
+        }], ctorParameters: () => [], propDecorators: { tabRouterNav: [{
                 type: ViewChild,
                 args: ['tabRouterNav']
             }] } });
 class SdOutletInjector {
     route;
-    parent;
-    constructor(route, 
-    // private childContexts: ChildrenOutletContexts,
-    parent) {
+    parentInjector;
+    constructor(route, parentInjector) {
         this.route = route;
-        this.parent = parent;
+        this.parentInjector = parentInjector;
     }
     get(token, notFoundValue) {
-        if (token === ActivatedRoute && this.route) {
-            return this.route;
+        if (token === ActivatedRoute) {
+            return this.route || notFoundValue;
         }
-        // if (token === ChildrenOutletContexts) {
-        //   return this.childContexts;
-        // }
-        return this.parent.injector.get(token, notFoundValue);
+        return this.parentInjector.get(token, notFoundValue);
     }
 }