Merge branch 'master' into vslavov/select-nav-closed

Author: bazal4o

projects/igniteui-angular/src/lib/combo/README.md

@@ -58,16 +58,15 @@ The service, should inform the combo for the total items that are on the server
 If we want to use a two-way data-binding, we could just use `ngModel` like this:
 
 ```html
-<igx-combo #combo [(ngModel)]="values"></igx-combo>
+<igx-combo #combo [data]="data" [(ngModel)]="values"></igx-combo>
 ```
 
 ```typescript
-@ViewChild('combo', { read: IgxComboComponent }) public combo: IgxComboComponent;
-get values() {
-    return this.combo.selectedItems();
-}
-set values(newValues: Array<any>) {
-    this.combo.selectItems(newValues);
+export class MyExampleComponent {
+    ...
+    public data: ExampleType[] = ...;
+    ...
+    public values: ExampleType[] = ...;
 }
 ```
 

projects/igniteui-angular/src/lib/combo/combo-add-item.component.ts

@@ -1,6 +1,9 @@
 import { IgxComboItemComponent } from './combo-item.component';
 import { Component } from '@angular/core';
 
+/**
+ * @hidden
+ */
 @Component({
     selector: 'igx-combo-add-item',
     template: '<ng-content></ng-content>',

projects/igniteui-angular/src/lib/combo/combo-dropdown.component.ts

@@ -31,16 +31,10 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
         super(elementRef, cdr, selection);
     }
 
-    /**
-     * @hidden
-     */
     protected get scrollContainer() {
         return this.verticalScrollContainer.dc.location.nativeElement;
     }
 
-    /**
-     * @hidden
-     */
     protected get isScrolledToLast(): boolean {
         const scrollTop = this.verticalScrollContainer.getVerticalScroll().scrollTop;
         const scrollHeight = this.verticalScrollContainer.getVerticalScroll().scrollHeight;
@@ -63,13 +57,13 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     public children: QueryList<IgxDropDownItemBase> = null;
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     @ContentChild(forwardRef(() => IgxForOfDirective), { read: IgxForOfDirective })
     public verticalScrollContainer: IgxForOfDirective<any>;
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     public onFocus() {
         this._focusedItem = this._focusedItem || this.items[0];
@@ -79,7 +73,7 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     }
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     public onBlur(evt?) {
         if (this._focusedItem) {
@@ -89,7 +83,7 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     }
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     public onToggleOpened() {
         this.onOpened.emit();
@@ -106,7 +100,7 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     }
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     public navigateFirst() {
         const vContainer = this.verticalScrollContainer;
@@ -123,7 +117,7 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     }
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     public navigateLast() {
         const vContainer = this.verticalScrollContainer;
@@ -142,9 +136,6 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
         });
     }
 
-    /**
-     * @hidden
-     */
     private navigateRemoteItem(direction) {
         this.verticalScrollContainer.addScrollTop(direction * this.combo.itemHeight);
         this.subscribeNext(this.verticalScrollContainer, () => {
@@ -157,7 +148,7 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     }
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     public selectItem(item: IgxDropDownItemBase) {
         if (item === null || item === undefined) {
@@ -244,9 +235,6 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
         }
     }
 
-    /**
-     * @hidden
-     */
     protected navigate(direction: Navigate, currentIndex?: number) {
         let index = -1;
         if (this._focusedItem) {
@@ -303,16 +291,10 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
 
     protected scrollToHiddenItem(newItem: any): void { }
 
-    /**
-     * @hidden
-     */
     protected scrollHandler = () => {
         this.comboAPI.disableTransitions = true;
     }
 
-    /**
-     * @hidden
-     */
     protected get sortedChildren(): IgxDropDownItemBase[] {
         if (this.children !== undefined) {
             return this.children.toArray()
@@ -344,28 +326,25 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
         return items;
     }
 
-    /**
-     * @hidden
-     */
     protected scrollToItem() {
     }
     /**
-     * @hidden
+     * @hidden @internal
      */
     onToggleClosing(e: CancelableBrowserEventArgs) {
         super.onToggleClosing(e);
         this._scrollPosition = this.verticalScrollContainer.getVerticalScroll().scrollTop;
     }
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     updateScrollPosition() {
         this.verticalScrollContainer.getVerticalScroll().scrollTop = this._scrollPosition;
     }
 
     /**
-     * @hidden
+     * @hidden @internal
      */
     public onItemActionKey(key: DropDownActionKey) {
         switch (key) {
@@ -405,7 +384,7 @@ export class IgxComboDropDownComponent extends IgxDropDownComponent implements I
     }
 
     /**
-     *@hidden
+     *@hidden @internal
      */
     public ngOnDestroy(): void {
         this.verticalScrollContainer.getVerticalScroll().removeEventListener('scroll', this.scrollHandler);

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

@@ -937,15 +937,6 @@ describe('igxCombo', () => {
             expect(checkbox.classList.contains(CSS_CLASS_CHECKED)).toBeFalsy();
             expect(combo.isItemSelected(combo.data[itemIndex])).toBeFalsy();
         }
-        it('Should properly return the selected value(s)', () => {
-            const fixture = TestBed.createComponent(IgxComboSampleComponent);
-            fixture.detectChanges();
-            const combo = fixture.componentInstance.combo;
-            expect(combo).toBeDefined();
-            expect(combo.values).toEqual([]);
-            combo.valueKey = undefined;
-            expect(combo.values).toEqual([]);
-        });
         it('Should properly call "writeValue" method', () => {
             const fixture = TestBed.createComponent(IgxComboSampleComponent);
             fixture.detectChanges();