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

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

View File

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

View File

@ -68,7 +68,21 @@ describe('createUrlTree', () => {
expect(params[1].path).toEqual('11'); expect(params[1].path).toEqual('11');
}); });
it('should support first segments contaings slashes', () => { it('should work if command = null', () => {
const p = serializer.parse('/a/b');
const t = createRoot(p, [null]);
const params = t.root.children[PRIMARY_OUTLET].segments;
expect(params[0].path).toEqual('null');
});
it('should work if command is undefined', () => {
const p = serializer.parse('/a/b');
const t = createRoot(p, [undefined]);
const params = t.root.children[PRIMARY_OUTLET].segments;
expect(params[0].path).toEqual('undefined');
});
it('should support first segments containing slashes', () => {
const p = serializer.parse('/'); const p = serializer.parse('/');
const t = createRoot(p, [{segmentPath: '/one'}, 'two/three']); const t = createRoot(p, [{segmentPath: '/one'}, 'two/three']);
expect(serializer.serialize(t)).toEqual('/%2Fone/two%2Fthree'); expect(serializer.serialize(t)).toEqual('/%2Fone/two%2Fthree');

View File

@ -1994,6 +1994,36 @@ describe('Integration', () => {
expect(() => buttons[1].click()).not.toThrow(); expect(() => buttons[1].click()).not.toThrow();
})); }));
it('should not throw when some command is null', fakeAsync(() => {
@Component({
selector: 'someCmp',
template:
`<router-outlet></router-outlet><a [routerLink]="[null]">Link</a><button [routerLink]="[null]">Button</button>`
})
class CmpWithLink {
}
TestBed.configureTestingModule({declarations: [CmpWithLink]});
const router: Router = TestBed.inject(Router);
expect(() => createRoot(router, CmpWithLink)).not.toThrow();
}));
it('should not throw when some command is undefined', fakeAsync(() => {
@Component({
selector: 'someCmp',
template:
`<router-outlet></router-outlet><a [routerLink]="[undefined]">Link</a><button [routerLink]="[undefined]">Button</button>`
})
class CmpWithLink {
}
TestBed.configureTestingModule({declarations: [CmpWithLink]});
const router: Router = TestBed.inject(Router);
expect(() => createRoot(router, CmpWithLink)).not.toThrow();
}));
it('should update hrefs when query params or fragment change', fakeAsync(() => { it('should update hrefs when query params or fragment change', fakeAsync(() => {
@Component({ @Component({
selector: 'someRoot', selector: 'someRoot',