fix(select): prevent dispose call on uninitialized properties (#1340)

akveo · Apr 8, 2019 · a7a158d · a7a158d
1 parent ffd386c
commit a7a158d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/framework/theme/components/select/select.component.ts b/src/framework/theme/components/select/select.component.ts
@@ -345,8 +345,12 @@ export class NbSelectComponent<T> implements OnInit, AfterViewInit, AfterContent
  ngOnDestroy() {
  this.alive = false;
 
- this.ref.dispose();
- this.triggerStrategy.destroy();
+ if (this.ref) {
+ this.ref.dispose();
+ }
+ if (this.triggerStrategy) {
+ this.triggerStrategy.destroy();
+ }
  }
 
  show() {

diff --git a/src/framework/theme/components/select/select.spec.ts b/src/framework/theme/components/select/select.spec.ts
@@ -281,6 +281,11 @@ describe('Component: NbSelectComponent', () => {
  expect(selectButton.textContent).toEqual(selectedOption.value.toString());
  }));
 
+ it(`should not call dispose on uninitialized resources`, () => {
+ const selectFixture = new NbSelectComponent(null, null, null, null, null, null);
+ expect(() => selectFixture.ngOnDestroy()).not.toThrow();
+ });
+
  describe('NbOptionComponent', () => {
  it('should ignore selection change if destroyed', () => {
  const selectFixture = TestBed.createComponent(NbReactiveFormSelectComponent);