From bfe4f1af5edc11cc00d1bd6a706a1dfd9cffdc6f Mon Sep 17 00:00:00 2001
From: Chris Thielen <cthielen@netflix.com>
Date: Fri, 3 Jul 2020 14:58:10 -0700
Subject: [PATCH] fix(uiSrefActive): Fix nested UISrefActive where UISref
 components are added/removed dynamically

Fixes #760
---
 src/directives/uiSrefStatus.ts         |  4 +-
 test/uiSrefActive/uiSrefActive.spec.ts | 71 +++++++++++++++++++++++---
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/directives/uiSrefStatus.ts b/src/directives/uiSrefStatus.ts
index ed824b5ad..66cc8a713 100644
--- a/src/directives/uiSrefStatus.ts
+++ b/src/directives/uiSrefStatus.ts
@@ -227,7 +227,9 @@ export class UISrefStatus {
 
     // Watch the @ContentChildren UISref[] components and get their target states
     this._srefs$ = new BehaviorSubject(withHostSref(this._srefs.toArray()));
-    this._srefChangesSub = this._srefs.changes.subscribe((srefs) => this._srefs$.next(withHostSref(srefs)));
+    this._srefChangesSub = this._srefs.changes.subscribe((srefs: QueryList<UISref>) =>
+      this._srefs$.next(withHostSref(srefs.toArray()))
+    );
 
     const targetStates$: Observable<TargetState[]> = this._srefs$.pipe(
       switchMap((srefs: UISref[]) => combineLatest<TargetState[]>(srefs.map((sref) => sref.targetState$)))
diff --git a/test/uiSrefActive/uiSrefActive.spec.ts b/test/uiSrefActive/uiSrefActive.spec.ts
index 659c7edc9..45544a0b8 100644
--- a/test/uiSrefActive/uiSrefActive.spec.ts
+++ b/test/uiSrefActive/uiSrefActive.spec.ts
@@ -1,19 +1,19 @@
-import { Component } from '@angular/core';
+import { Component, Type } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
 import { UIRouter } from '@uirouter/core';
-import { UIRouterModule } from '../../src/uiRouterNgModule';
 import { UISrefActive } from '../../src';
+import { UIRouterModule } from '../../src/uiRouterNgModule';
 
 describe('uiSrefActive', () => {
-  const tick = () => new Promise(resolve => setTimeout(resolve));
+  const tick = () => new Promise((resolve) => setTimeout(resolve));
 
-  const initialize = (Component, states) => {
+  const initialize = <T>(ComponentClass: Type<T>, states) => {
     const fixture = TestBed.configureTestingModule({
-      declarations: [Component],
+      declarations: [ComponentClass],
       imports: [UIRouterModule.forRoot({ useHash: true, states })],
-    }).createComponent(Component);
+    }).createComponent(ComponentClass);
     fixture.detectChanges();
 
     return fixture;
@@ -65,4 +65,63 @@ describe('uiSrefActive', () => {
         });
     }));
   });
+
+  describe('on a parent element', () => {
+    it('applies the active class when any child link is active', async(async () => {
+      const template = `
+      <li uiSrefActive="active">
+        <a uiSref="statea">State A</a>
+        <a uiSref="statec">State C</a>
+      </li>
+    `;
+      @Component({ template })
+      class TestComponent {}
+
+      const fixture = initialize(TestComponent, [{ name: 'statea' }, { name: 'stateb' }, { name: 'statec' }]);
+
+      const des = fixture.debugElement.queryAll(By.directive(UISrefActive));
+      const router = fixture.debugElement.injector.get(UIRouter);
+
+      await router.stateService.go('statea').then(tick);
+      expect(des[0].nativeElement.classList).toContain('active');
+
+      await router.stateService.go('stateb').then(tick);
+      expect(des[0].nativeElement.classList).not.toContain('active');
+
+      await router.stateService.go('statec').then(tick);
+      expect(des[0].nativeElement.classList).toContain('active');
+    }));
+
+    // Test for https://github.com/ui-router/angular/issues/760
+    it('can dynamically add or remove nested uiSref', async(async () => {
+      const template = `
+        <li id="parent" uiSrefActive="active">
+          <a uiSref="statea"></a>
+          <a uiSref="stateb" *ngIf="show"></a>
+        </li>
+      `;
+      @Component({ template })
+      class TestComponent {
+        public show = false;
+      }
+
+      const states = [{ name: 'statea' }, { name: 'stateb' }, { name: 'statec' }];
+      const fixture = initialize(TestComponent, states);
+
+      const des = fixture.debugElement.queryAll(By.directive(UISrefActive));
+      const router = fixture.debugElement.injector.get(UIRouter);
+
+      await router.stateService.go('statea').then(tick);
+      expect(des[0].nativeElement.classList).toContain('active');
+
+      fixture.componentInstance.show = true;
+      fixture.detectChanges();
+
+      await router.stateService.go('stateb').then(tick);
+      expect(des[0].nativeElement.classList).toContain('active');
+
+      await router.stateService.go('statec').then(tick);
+      expect(des[0].nativeElement.classList).not.toContain('active');
+    }));
+  });
 });