From 2b369d9cc39927e04bb2148e3005408f0a732d39 Mon Sep 17 00:00:00 2001 From: Matthieu Riegler Date: Sat, 12 Nov 2022 17:33:48 +0100 Subject: [PATCH] fix(router): correct type of nextState parameter in canDeactivate Correct type of nextState parameter in canDeactivate guard to indicate it's never undefined Fixes #47153 --- goldens/public-api/router/index.md | 2 +- packages/router/src/models.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/goldens/public-api/router/index.md b/goldens/public-api/router/index.md index 83749ad7eefe43..5730cb40f3527f 100644 --- a/goldens/public-api/router/index.md +++ b/goldens/public-api/router/index.md @@ -133,7 +133,7 @@ export type CanActivateFn = (route: ActivatedRouteSnapshot, state: RouterStateSn // @public export interface CanDeactivate { // (undocumented) - canDeactivate(component: T, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Observable | Promise | boolean | UrlTree; + canDeactivate(component: T, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState: RouterStateSnapshot): Observable | Promise | boolean | UrlTree; } // @public diff --git a/packages/router/src/models.ts b/packages/router/src/models.ts index b03366dc7904ad..05550cb59165af 100644 --- a/packages/router/src/models.ts +++ b/packages/router/src/models.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {EnvironmentInjector, EnvironmentProviders, InjectionToken, NgModuleFactory, Provider, ProviderToken, Type} from '@angular/core'; +import {EnvironmentInjector, EnvironmentProviders, InjectionToken, NgModuleFactory, Provider, Type} from '@angular/core'; import {Observable} from 'rxjs'; import {DeprecatedLoadChildren} from './deprecated_load_children'; @@ -851,7 +851,7 @@ export type CanActivateChildFn = (childRoute: ActivatedRouteSnapshot, state: Rou export interface CanDeactivate { canDeactivate( component: T, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, - nextState?: RouterStateSnapshot): Observable|Promise|boolean + nextState: RouterStateSnapshot): Observable|Promise|boolean |UrlTree; }