chore(select): Address comments #5911

IgniteUI · Nov 19, 2019 · 8571f47 · 8571f47
1 parent b42308c
commit 8571f47
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,9 +48,8 @@ All notable changes for each version of this project will be documented in this
         </ng-template>
     </igx-grid>
 
-
 - `IgxSelect`: 
-    - adding `IgxSelectHeaderDirective` and `IgxSelectFooterDirective`. These can be used to provide a custom header, respectively footer templates for the `igxSelect` drop-down list. If there are no templates marked with these directives - no default templates will be used so the drop-down list will not have header or footer.
+    - adding `IgxSelectHeaderDirective` and `IgxSelectFooterDirective`. These can be used to provide a custom header, respectively footer templates for the `igxSelect` drop-down list. If there are no templates marked with these directives - no default templates will be used so the drop-down list will not have header nor footer.
 
 - `IgxCarousel`:
     - `keyboardSupport` input is added, which can be used to enable and disable keyboard navigation

diff --git a/projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts b/projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts
@@ -30,7 +30,7 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     }
 
     /** @hidden @internal */
-   public get scrollContainer() {
+   public get scrollContainer(): HTMLElement {
         return this.virtDir.dc.location.nativeElement;
     }
 

diff --git a/projects/igniteui-angular/src/lib/drop-down/drop-down.base.ts b/projects/igniteui-angular/src/lib/drop-down/drop-down.base.ts
@@ -30,7 +30,7 @@ export class IgxDropDownBaseDirective extends DisplayDensityBase implements IDro
      * @hidden @internal
      * Get dropdown's html element of its scroll container
      */
-    public get scrollContainer() {
+    public get scrollContainer(): HTMLElement {
         return this.element;
     }
 

diff --git a/projects/igniteui-angular/src/lib/drop-down/drop-down.component.ts b/projects/igniteui-angular/src/lib/drop-down/drop-down.component.ts
@@ -206,7 +206,7 @@ export class IgxDropDownComponent extends IgxDropDownBaseDirective implements ID
     }
 
     /** @hidden @internal */
-    public get scrollContainer() {
+    public get scrollContainer(): HTMLElement {
         return this.scrollContainerRef.nativeElement;
     }
 

diff --git a/projects/igniteui-angular/src/lib/select/select-item.component.ts b/projects/igniteui-angular/src/lib/select/select-item.component.ts
@@ -53,8 +53,7 @@ export class IgxSelectItemComponent extends IgxDropDownItemComponent implements
     }
 
     public set selected(value: any) {
-        if (value && !this.isHeader && !this.disabled) { // TODO: Refactor: inherited isHeader is regarding group items
-                                                         // not an actual(select) header.
+        if (value && !this.isHeader && !this.disabled) {
             this.dropDown.selectItem(this);
         }
     }

diff --git a/projects/igniteui-angular/src/lib/select/select.component.spec.ts b/projects/igniteui-angular/src/lib/select/select.component.spec.ts
@@ -1,5 +1,5 @@
 import { IgxInputState } from './../directives/input/input.directive';
-import { Component, ViewChild, DebugElement } from '@angular/core';
+import { Component, ViewChild, DebugElement, OnInit } from '@angular/core';
 import { async, TestBed, tick, fakeAsync } from '@angular/core/testing';
 import { FormsModule, FormGroup, FormBuilder, FormControl, Validators, ReactiveFormsModule, NgForm } from '@angular/forms';
 import { By } from '@angular/platform-browser';