Merge branch 'master' into tzhelev/gridSearch-exactMatch

Author: tachojelev

package-lock.json

@@ -317,7 +317,7 @@ export class IgxChipComponent implements AfterViewInit {
             nextStatus: false,
             cancel: false
         };
-        if (newValue && this.selectable && !this._selected) {
+        if (newValue && !this._selected) {
             onSelectArgs.nextStatus = true;
             this.onSelection.emit(onSelectArgs);
 

projects/igniteui-angular/src/lib/chips/chip.component.ts

@@ -176,14 +176,15 @@ export class IgxChipsAreaComponent implements DoCheck {
         let orderChanged = false;
         const chipsArray = this.chipsList.toArray();
         const dragChipIndex = chipsArray.findIndex((el) => el === event.owner);
-
         if (event.shiftKey === true) {
             if (event.key === 'ArrowLeft' || event.key === 'Left') {
                 orderChanged = this.positionChipAtIndex(dragChipIndex, dragChipIndex - 1, false);
                 if (orderChanged) {
+                    // The `modifiedChipsArray` is out of date in the setTimeout sometimes.
+                    const chipArray = this.modifiedChipsArray;
                     setTimeout(() => {
-                        this.modifiedChipsArray[dragChipIndex - 1].chipArea.nativeElement.focus();
-                    }, 0);
+                        chipArray[dragChipIndex - 1].chipArea.nativeElement.focus();
+                    });
                 }
             } else if (event.key === 'ArrowRight' || event.key === 'Right') {
                 orderChanged = this.positionChipAtIndex(dragChipIndex, dragChipIndex + 1, true);

projects/igniteui-angular/src/lib/chips/chips-area.component.ts

@@ -1,4 +1,4 @@
-import { ChipsSampleComponent } from './../../../../../src/app/chips/chips.sample';
+import { ChipsSampleComponent } from './../../../../../src/app/chips/chips.sample';
 import { Component, ViewChild, ViewChildren, QueryList } from '@angular/core';
 import {
     async,
@@ -555,6 +555,17 @@ describe('IgxChipsArea', () => {
         });
     });
 
+    it('should be able to select chip using api when selectable is set to false', () => {
+        const fix = TestBed.createComponent(TestChipComponent);
+        fix.detectChanges();
+
+        const selectedChip = fix.componentInstance.chipsArea.chipsList.toArray()[0];
+        selectedChip.selected = true;
+        fix.detectChanges();
+
+        expect(selectedChip.selected).toBe(true);
+    });
+
     it('should focus on chip correctly', () => {
         const fix = TestBed.createComponent(TestChipComponent);
         fix.detectChanges();
@@ -600,7 +611,7 @@ describe('IgxChipsArea', () => {
         expect(document.activeElement).toBe(firstChipComp.chipArea.nativeElement);
     });
 
-    it('should reorder chips when shift + leftarrow and shift + rightarrow is pressed', () => {
+    it('should reorder chips when shift + leftarrow and shift + rightarrow is pressed', async(() => {
         const leftKey = new KeyboardEvent('keydown', {
             'key': 'ArrowLeft',
             shiftKey: true
@@ -651,9 +662,61 @@ describe('IgxChipsArea', () => {
             expect(firstChipLeft).toEqual(newFirstChipLeft);
             expect(newSecondChipLeft).toEqual(secondChipLeft);
         });
-    });
+    }));
+
+    it('should reorder chips when shift + leftarrow is pressed and shift + rightarrow is pressed twice', async(() => {
+        const fix = TestBed.createComponent(TestChipReorderComponent);
+        fix.detectChanges();
+
+        const leftKey = new KeyboardEvent('keydown', {
+            'key': 'ArrowLeft',
+            shiftKey: true
+        });
+        const rightKey = new KeyboardEvent('keydown', {
+            'key': 'ArrowRight',
+            shiftKey: true
+        });
+        const chipAreaComponent = fix.componentInstance.chipsArea;
+        const chipComponents = fix.debugElement.queryAll(By.directive(IgxChipComponent));
+        const targetChip = chipComponents[2].componentInstance;
+        const targetChipElem = targetChip.chipArea.nativeElement;
+
+        targetChipElem.focus();
+        fix.detectChanges();
+
+        expect(document.activeElement).toBe(targetChipElem);
+        expect(chipAreaComponent.chipsList.toArray()[2].id).toEqual('Town');
+        expect(chipAreaComponent.chipsList.toArray()[3].id).toEqual('FirstName');
+
+        document.activeElement.dispatchEvent(rightKey);
+        fix.detectChanges();
+
+        fix.whenStable().then(() => {
+            expect(document.activeElement).toBe(targetChipElem);
+            expect(chipAreaComponent.chipsList.toArray()[2].id).toEqual('FirstName');
+            expect(chipAreaComponent.chipsList.toArray()[3].id).toEqual('Town');
+
+            document.activeElement.dispatchEvent(leftKey);
+            fix.detectChanges();
+
+            return fix.whenStable();
+        }).then(() => {
+            expect(document.activeElement).toBe(targetChipElem);
+            expect(chipAreaComponent.chipsList.toArray()[2].id).toEqual('Town');
+            expect(chipAreaComponent.chipsList.toArray()[3].id).toEqual('FirstName');
 
-    it('should not reorder chips when shift + leftarrow and shift + rightarrow is pressed when the chip is going out of bounce', () => {
+            document.activeElement.dispatchEvent(leftKey);
+            fix.detectChanges();
+
+            return fix.whenStable();
+        }).then(() => {
+            expect(document.activeElement).toBe(targetChipElem);
+            expect(chipAreaComponent.chipsList.toArray()[2].id).toEqual('City');
+            expect(chipAreaComponent.chipsList.toArray()[3].id).toEqual('FirstName');
+        });
+    }));
+
+    it('should not reorder chips for shift + leftarrow and shift + rightarrow when the chip is going out of bounce', async(() => {
         const leftKey = new KeyboardEvent('keydown', {
             'key': 'ArrowLeft',
             shiftKey: true
@@ -694,7 +757,7 @@ describe('IgxChipsArea', () => {
             expect(firstChipLeft).toEqual(newFirstChipLeft);
             expect(newlastChipLeft).toEqual(lastChipLeft);
         });
-    });
+    }));
 
     it('should delete chip when delete button is pressed and chip is removable', () => {
         const deleteKey = new KeyboardEvent('keydown', {
@@ -736,7 +799,7 @@ describe('IgxChipsArea', () => {
         expect(chipComponents.length).toEqual(3);
     });
 
-    it('chip should persist selected state when it is dragged and dropped', () => {
+    it('chip should persist selected state when it is dragged and dropped', async(() => {
         const spaceKeyEvent = new KeyboardEvent('keydown', {
             'key': ' '
         });
@@ -786,7 +849,7 @@ describe('IgxChipsArea', () => {
             const firstChip = chipComponents[0].componentInstance;
             expect(firstChip.selected).not.toBeTruthy();
         });
-    });
+    }));
 
     it('should not fire any event of the chip area when attempting deleting of a chip', () => {
         const fix = TestBed.createComponent(TestChipComponent);

projects/igniteui-angular/src/lib/chips/chips-area.spec.ts

@@ -58,6 +58,7 @@ let NEXT_ID = 0;
         [{ provide: NG_VALUE_ACCESSOR, useExisting: IgxDatePickerComponent, multi: true }],
     // tslint:disable-next-line:component-selector
     selector: 'igx-datePicker',
+    styles: [':host {display: block;}'],
     templateUrl: 'date-picker.component.html'
 })
 export class IgxDatePickerComponent implements ControlValueAccessor, OnInit, OnDestroy {

projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts

@@ -155,7 +155,7 @@ export class IgxInputDirective implements AfterViewInit, OnDestroy {
      */
     ngAfterViewInit() {
         this.inputGroup.hasPlaceholder = this.nativeElement.hasAttribute('placeholder');
-        this.inputGroup.disabled = this.nativeElement.hasAttribute('disabled');
+        this.inputGroup.disabled = this.inputGroup.disabled || this.nativeElement.hasAttribute('disabled');
         this.inputGroup.isRequired = this.nativeElement.hasAttribute('required');
 
         // Also check the control's validators for required