fix(router): `RouterLinkActive` should run CD when setting `isActive` (#21411)
When using the routerLinkActive directive inside a component that is using ChangeDetectionStrategy.OnPush and lazy loaded module routes the routerLinkActive directive does not update after clicking a link to a lazy loaded route that has not already been loaded. Also the OnPush nav component does not set routerLinkActive correctly when the default route loads, the non-OnPush nav component works fine. regression caused by #15943 closes #19934 PR Close #21411
This commit is contained in:
parent
5218916a7e
commit
80d0067048
|
@ -398,7 +398,7 @@ export declare class RouterLinkActive implements OnChanges, OnDestroy, AfterCont
|
||||||
routerLinkActiveOptions: {
|
routerLinkActiveOptions: {
|
||||||
exact: boolean;
|
exact: boolean;
|
||||||
};
|
};
|
||||||
constructor(router: Router, element: ElementRef, renderer: Renderer2, link?: RouterLink | undefined, linkWithHref?: RouterLinkWithHref | undefined);
|
constructor(router: Router, element: ElementRef, renderer: Renderer2, cdr: ChangeDetectorRef, link?: RouterLink | undefined, linkWithHref?: RouterLinkWithHref | undefined);
|
||||||
ngAfterContentInit(): void;
|
ngAfterContentInit(): void;
|
||||||
ngOnChanges(changes: SimpleChanges): void;
|
ngOnChanges(changes: SimpleChanges): void;
|
||||||
ngOnDestroy(): void;
|
ngOnDestroy(): void;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {AfterContentInit, ContentChildren, Directive, ElementRef, Input, OnChanges, OnDestroy, Optional, QueryList, Renderer2, SimpleChanges} from '@angular/core';
|
import {AfterContentInit, ChangeDetectorRef, ContentChildren, Directive, ElementRef, Input, OnChanges, OnDestroy, Optional, QueryList, Renderer2, SimpleChanges} from '@angular/core';
|
||||||
import {Subscription} from 'rxjs';
|
import {Subscription} from 'rxjs';
|
||||||
|
|
||||||
import {Event, NavigationEnd} from '../events';
|
import {Event, NavigationEnd} from '../events';
|
||||||
|
@ -91,7 +91,7 @@ export class RouterLinkActive implements OnChanges, OnDestroy, AfterContentInit
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private router: Router, private element: ElementRef, private renderer: Renderer2,
|
private router: Router, private element: ElementRef, private renderer: Renderer2,
|
||||||
@Optional() private link?: RouterLink,
|
private readonly cdr: ChangeDetectorRef, @Optional() private link?: RouterLink,
|
||||||
@Optional() private linkWithHref?: RouterLinkWithHref) {
|
@Optional() private linkWithHref?: RouterLinkWithHref) {
|
||||||
this.subscription = router.events.subscribe((s: Event) => {
|
this.subscription = router.events.subscribe((s: Event) => {
|
||||||
if (s instanceof NavigationEnd) {
|
if (s instanceof NavigationEnd) {
|
||||||
|
@ -126,6 +126,7 @@ export class RouterLinkActive implements OnChanges, OnDestroy, AfterContentInit
|
||||||
const hasActiveLinks = this.hasActiveLinks();
|
const hasActiveLinks = this.hasActiveLinks();
|
||||||
if (this.isActive !== hasActiveLinks) {
|
if (this.isActive !== hasActiveLinks) {
|
||||||
(this as any).isActive = hasActiveLinks;
|
(this as any).isActive = hasActiveLinks;
|
||||||
|
this.cdr.markForCheck();
|
||||||
this.classes.forEach((c) => {
|
this.classes.forEach((c) => {
|
||||||
if (hasActiveLinks) {
|
if (hasActiveLinks) {
|
||||||
this.renderer.addClass(this.element.nativeElement, c);
|
this.renderer.addClass(this.element.nativeElement, c);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {CommonModule} from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import {Component, ContentChild, NgModule, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core';
|
import {ChangeDetectionStrategy, Component, ContentChild, NgModule, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core';
|
||||||
import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
|
import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
|
||||||
import {Router} from '@angular/router';
|
import {Router} from '@angular/router';
|
||||||
import {RouterTestingModule} from '@angular/router/testing';
|
import {RouterTestingModule} from '@angular/router/testing';
|
||||||
|
@ -109,6 +109,35 @@ describe('Integration', () => {
|
||||||
|
|
||||||
expect(fixture.nativeElement.innerHTML).toContain('isActive: false');
|
expect(fixture.nativeElement.innerHTML).toContain('isActive: false');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
it('should set isActive with OnPush change detection - #19934', fakeAsync(() => {
|
||||||
|
@Component({
|
||||||
|
template: `
|
||||||
|
<div routerLink="/simple" #rla="routerLinkActive" routerLinkActive>
|
||||||
|
isActive: {{rla.isActive}}
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush
|
||||||
|
})
|
||||||
|
class OnPushComponent {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Component({template: 'simple'})
|
||||||
|
class SimpleCmp {
|
||||||
|
}
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
imports: [RouterTestingModule.withRoutes([{path: 'simple', component: SimpleCmp}])],
|
||||||
|
declarations: [OnPushComponent, SimpleCmp]
|
||||||
|
});
|
||||||
|
|
||||||
|
const router: Router = TestBed.get(Router);
|
||||||
|
const fixture = createRoot(router, OnPushComponent);
|
||||||
|
router.navigateByUrl('/simple');
|
||||||
|
advance(fixture);
|
||||||
|
|
||||||
|
expect(fixture.nativeElement.innerHTML).toContain('isActive: true');
|
||||||
|
}));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue