fix: (core) make router in dialog optional (#3360)

SAP · Sep 24, 2020 · f2fa015 · f2fa015
1 parent 920003a
commit f2fa015
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/libs/core/src/lib/dialog/dialog.component.spec.ts b/libs/core/src/lib/dialog/dialog.component.spec.ts
@@ -76,6 +76,13 @@ describe('DialogComponent', () => {
         expect(dialogComponent).toBeTruthy();
     });
 
+    it('should create w/o Router', () => {
+        setup([{ token: Router, provider: { useValue: null } }]);
+        expect(router).toBeNull();
+        expect(component).toBeTruthy();
+        expect(dialogComponent).toBeTruthy();
+    });
+
     it('should hide dialog', () => {
         setup();
 

diff --git a/libs/core/src/lib/dialog/dialog.component.ts b/libs/core/src/lib/dialog/dialog.component.ts
@@ -112,8 +112,8 @@ export class DialogComponent implements OnInit, AfterViewInit, OnDestroy, CssCla
         @Optional() @Inject(DIALOG_REF) private _dialogRef: DialogRef,
         private _elementRef: ElementRef,
         private _changeDetectorRef: ChangeDetectorRef,
-        private _router: Router
-    ) {}
+        @Optional() private _router?: Router
+    ) { }
 
     /** @hidden */
     ngOnInit(): void {
@@ -250,12 +250,14 @@ export class DialogComponent implements OnInit, AfterViewInit, OnDestroy, CssCla
 
     /** @hidden Subscribes to router navigation for the closing of dialog on navigation start. */
     private _subscribeToNavigation(): void {
-        this._subscriptions.add(
-            this._router.events.subscribe(event => {
-                if (event instanceof NavigationStart && this.dialogConfig.closeOnNavigation) {
-                    this._dialogRef.dismiss();
-                }
-            })
-        );
+        if (this._router) {
+            this._subscriptions.add(
+                this._router.events.subscribe(event => {
+                    if (event instanceof NavigationStart && this.dialogConfig.closeOnNavigation) {
+                        this._dialogRef.dismiss();
+                    }
+                })
+            );
+        }
     }
 }