diff --git a/src/app/form/form.component.scss b/src/app/form/form.component.scss index 470827eff01f3b4fc3411913053e3e1a820cfb48..0f9ef4733f7d1efc3ed7b983a8c35fe1bd152679 100644 --- a/src/app/form/form.component.scss +++ b/src/app/form/form.component.scss @@ -17,7 +17,7 @@ h3 { z-index: $structure-details-z-index; @media #{$tablet} { position: fixed; //Hide default header app. - height: calc(100vh); + height: 100vh; top: 0; } } diff --git a/src/app/guards/deactivate.guard.ts b/src/app/guards/deactivate.guard.ts index d8a74fa6cdb88ff54075743c9f14e7ec20c10561..3f86e0502a0d593451026a2c161db5ed69c1ad1d 100644 --- a/src/app/guards/deactivate.guard.ts +++ b/src/app/guards/deactivate.guard.ts @@ -1,6 +1,6 @@ -import { ActivatedRouteSnapshot, CanDeactivate, RouterStateSnapshot } from '@angular/router'; +import { CanDeactivate } from '@angular/router'; import { Injectable } from '@angular/core'; -import { Observable, Subject } from 'rxjs'; +import { Observable } from 'rxjs'; export interface IDeactivateComponent { canExit: () => Observable<boolean> | Promise<boolean> | boolean; @@ -12,16 +12,10 @@ export interface IDeactivateComponent { @Injectable() export class DeactivateGuard implements CanDeactivate<Object> { component: Object; - route: ActivatedRouteSnapshot; constructor() {} - canDeactivate( - component: IDeactivateComponent, - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot, - nextState: RouterStateSnapshot - ): Observable<boolean> | Promise<boolean> | boolean { + canDeactivate(component: IDeactivateComponent): Observable<boolean> | Promise<boolean> | boolean { return component.canExit(); } }