Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(uiSref): run update when input properties change #141

Merged
merged 3 commits into from
Sep 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/directives/uiSref.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @ng2api @module directives */
/** */
import { UIRouter, extend, Obj, TransitionOptions, TargetState } from "@uirouter/core";
import { Directive, Inject, Input, Optional, ElementRef, Renderer2 } from "@angular/core";
import { Directive, Inject, Input, Optional, ElementRef, Renderer2, OnChanges, SimpleChanges } from "@angular/core";
import { UIView, ParentUIViewInject } from "./uiView";
import { ReplaySubject } from "rxjs/ReplaySubject";
import { Subscription } from "rxjs/Subscription";
Expand Down Expand Up @@ -70,7 +70,8 @@ export class AnchorUISref {
selector: '[uiSref]',
host: { '(click)': 'go()' }
})
export class UISref {
export class UISref implements OnChanges {

/**
* `@Input('uiSref')` The name of the state to link to
*
Expand Down Expand Up @@ -134,6 +135,10 @@ export class UISref {
this.update();
}

ngOnChanges(changes: SimpleChanges): void {
this.update();
}

ngOnDestroy() {
this._emit = false;
this._statesSub.unsubscribe();
Expand Down
91 changes: 88 additions & 3 deletions test/uiSref/uiSref.spec.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,41 @@
import { Component, DebugElement } from '@angular/core';
import { Component, DebugElement, ViewChildren, QueryList } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';

import { UIRouterModule } from '../../src/uiRouterNgModule';
import { UISref } from '../../src/directives/uiSref';
import { UIRouter } from '@uirouter/core';
import { UIRouter, TargetState, TransitionOptions } from '@uirouter/core';
import { Subject } from 'rxjs/Subject';
import { Subscription } from "rxjs/Subscription";

describe('uiSref', () => {
@Component({
template: `
<a [uiSref]="linkA" [target]="targetA"></a>
<a [uiSref]="linkA" [target]="targetA" [uiParams]="linkAParams" [uiOptions]="linkAOptions"></a>
<a [uiSref]="linkB"></a>
`
})
class TestComponent {
linkA: string;
linkAParams: any;
linkAOptions: TransitionOptions;
targetA: string;
linkB: string;

@ViewChildren(UISref) srefs: QueryList<UISref>;

get linkASref() {
return this.srefs.first;
}

get linkBSref() {
return this.srefs.toArray()[1];
}

constructor() {
this.linkA = null;
this.linkAParams = null;
this.linkAOptions = null;
this.targetA = '';
this.linkB = '';
}
Expand All @@ -40,6 +55,7 @@ describe('uiSref', () => {
des = fixture.debugElement.queryAll(By.directive(UISref));
});


it('should not bind "null" string to `href`', () => {
expect(des[0].nativeElement.hasAttribute('href')).toBeFalsy();
expect(des[1].nativeElement.hasAttribute('href')).toBeFalsy();
Expand Down Expand Up @@ -114,6 +130,75 @@ describe('uiSref', () => {
});
});
});

describe('when the bound values change', () => {
let fixture: ComponentFixture<TestComponent>;
let comp: TestComponent;
let logger: TargetState[];
let subscription: Subscription;

beforeEach(() => {
fixture = TestBed.configureTestingModule({
declarations: [TestComponent],
imports: [UIRouterModule.forRoot({ useHash: true })]
}).createComponent(TestComponent);
fixture.detectChanges();
comp = fixture.componentInstance;
logger = [];
subscription = comp.linkASref.targetState$.subscribe(evt => logger.push(evt));
});

afterEach(() => {
subscription.unsubscribe();
});

describe('when the uiSref is empty', () => {
it('should emit an empty target state event', () =>{
expect(logger.length).toBe(1);
expect(logger[0].name()).toBeNull();
});
})

describe('when the target state changes', () => {
beforeEach(() => {
comp.linkA = 'stateA';
fixture.detectChanges();
});

it('should emit an event', () => {
expect(logger.length).toBe(2);
expect(logger[1].name()).toBe('stateA');
});
});

describe('when the target params change', () => {
const params = { paramA: 'paramA' };

beforeEach(() => {
comp.linkAParams = params;
fixture.detectChanges();
});

it('should emit an event', () => {
expect(logger.length).toBe(2);
expect(logger[1].params()).toEqual(params);
});
});

describe('when the transition options change', () => {
const options: TransitionOptions = { custom: 'custom' };

beforeEach(() => {
comp.linkAOptions = options;
fixture.detectChanges();
});

it ('should emit an event', () => {
expect(logger.length).toBe(2);
expect(logger[1].options().custom).toEqual(options.custom);
});
})
});
});
});