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

fix(router): state data missing in routerLink (#36462)

Browse Source 
fixes #33173 - router state data is missing on routerLink when used
with non-anchor elements.

PR Close #36462
This commit is contained in:
Andrew Scott
2020-04-06 13:39:33 -07:00
committed by Kara Erickson
parent 95fc3d4c5c
commit e0415dbf16
2 changed files with 234 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
packages/router/src/directives/router_link.ts
View File

@ -7,7 +7,7 @@
*/
import {LocationStrategy} from '@angular/common';
import {Attribute, Directive, ElementRef, HostBinding, HostListener, Input, OnChanges, OnDestroy, Renderer2, isDevMode} from '@angular/core';
import {Attribute, Directive, ElementRef, HostBinding, HostListener, Input, isDevMode, OnChanges, OnDestroy, Renderer2} from '@angular/core';
import {Subscription} from 'rxjs';
import {QueryParamsHandling} from '../config';
@ -114,21 +114,21 @@ import {UrlTree} from '../url_tree';
@Directive({selector: ':not(a):not(area)[routerLink]'})
export class RouterLink {
// TODO(issue/24571): remove '!'.
@Input() queryParams !: {[k: string]: any};
@Input() queryParams!: {[k: string]: any};
// TODO(issue/24571): remove '!'.
@Input() fragment !: string;
@Input() fragment!: string;
// TODO(issue/24571): remove '!'.
@Input() queryParamsHandling !: QueryParamsHandling;
@Input() queryParamsHandling!: QueryParamsHandling;
// TODO(issue/24571): remove '!'.
@Input() preserveFragment !: boolean;
@Input() preserveFragment!: boolean;
// TODO(issue/24571): remove '!'.
@Input() skipLocationChange !: boolean;
@Input() skipLocationChange!: boolean;
// TODO(issue/24571): remove '!'.
@Input() replaceUrl !: boolean;
@Input() replaceUrl!: boolean;
@Input() state?: {[k: string]: any};
private commands: any[] = [];
// TODO(issue/24571): remove '!'.
private preserve !: boolean;
private preserve!: boolean;
constructor(
private router: Router, private route: ActivatedRoute,
@ -163,6 +163,7 @@ export class RouterLink {
const extras = {
skipLocationChange: attrBoolValue(this.skipLocationChange),
replaceUrl: attrBoolValue(this.replaceUrl),
state: this.state,
};
this.router.navigateByUrl(this.urlTree, extras);
return true;
@ -194,28 +195,28 @@ export class RouterLink {
@Directive({selector: 'a[routerLink],area[routerLink]'})
export class RouterLinkWithHref implements OnChanges, OnDestroy {
// TODO(issue/24571): remove '!'.
@HostBinding('attr.target') @Input() target !: string;
@HostBinding('attr.target') @Input() target!: string;
// TODO(issue/24571): remove '!'.
@Input() queryParams !: {[k: string]: any};
@Input() queryParams!: {[k: string]: any};
// TODO(issue/24571): remove '!'.
@Input() fragment !: string;
@Input() fragment!: string;
// TODO(issue/24571): remove '!'.
@Input() queryParamsHandling !: QueryParamsHandling;
@Input() queryParamsHandling!: QueryParamsHandling;
// TODO(issue/24571): remove '!'.
@Input() preserveFragment !: boolean;
@Input() preserveFragment!: boolean;
// TODO(issue/24571): remove '!'.
@Input() skipLocationChange !: boolean;
@Input() skipLocationChange!: boolean;
// TODO(issue/24571): remove '!'.
@Input() replaceUrl !: boolean;
@Input() replaceUrl!: boolean;
@Input() state?: {[k: string]: any};
private commands: any[] = [];
private subscription: Subscription;
// TODO(issue/24571): remove '!'.
private preserve !: boolean;
private preserve!: boolean;
// the url displayed on the anchor element.
// TODO(issue/24571): remove '!'.
@HostBinding() href !: string;
@HostBinding() href!: string;
constructor(
private router: Router, private route: ActivatedRoute,
@ -244,8 +245,12 @@ export class RouterLinkWithHref implements OnChanges, OnDestroy {
this.preserve = value;
}
ngOnChanges(changes: {}): any { this.updateTargetUrlAndHref(); }
ngOnDestroy(): any { this.subscription.unsubscribe(); }
ngOnChanges(changes: {}): any {
this.updateTargetUrlAndHref();
}
ngOnDestroy(): any {
this.subscription.unsubscribe();
}
@HostListener('click', ['$event.button', '$event.ctrlKey', '$event.metaKey', '$event.shiftKey'])
onClick(button: number, ctrlKey: boolean, metaKey: boolean, shiftKey: boolean): boolean {