cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(router): add null support for RouterLink directive (#32616)

Browse Source 
Value of "undefined" passed as segment in routerLink is stringified to string "undefined".
This change introduces the same behavior for value of "null".

PR Close #32616
This commit is contained in:
Krzysztof Grzybek
2019-09-11 20:38:56 +02:00
committed by Andrew Kushnir
parent 2170ea270a
commit 616543ded0
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/router/src/create_url_tree.ts
View File

@ -186,9 +186,11 @@ function getPath(command: any): any {
}
function getOutlets(commands: any[]): {[k: string]: any[]} {
if (!(typeof commands[0] === 'object')) return {[PRIMARY_OUTLET]: commands};
if (commands[0].outlets === undefined) return {[PRIMARY_OUTLET]: commands};
return commands[0].outlets;
if (typeof commands[0] === 'object' && commands[0] !== null && commands[0].outlets) {
return commands[0].outlets;
}
return {[PRIMARY_OUTLET]: commands};
}
function updateSegmentGroup(
@ -274,7 +276,8 @@ function createNewSegmentGroup(
let i = 0;
while (i < commands.length) {
if (typeof commands[i] === 'object' && commands[i].outlets !== undefined) {
if (typeof commands[i] === 'object' && commands[i] !== null &&
commands[i].outlets !== undefined) {
const children = createNewSegmentChildren(commands[i].outlets);
return new UrlSegmentGroup(paths, children);
}