Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into sstoychev/mrl-next-prev-cell-master

Author: 3phase

CHANGELOG.md

@@ -14,6 +14,8 @@ All notable changes for each version of this project will be documented in this
     ```typescript
     public pinningConfiguration: IPinningConfig = { columns: ColumnPinningPosition.End };
     ```
+- `IgxCombo`:
+    - Added `autoFocusSearch` input that allows to manipulate the combo's opening behavior. When the property is `true` (by default), the combo's search input is focused on open. When set to `false`, the focus goes to the combo items container, which can be used to prevent the software keyboard from activating on mobile devices when opening the combo.
 
 ### RTL Support
 - `igxSlider` have full right-to-left (RTL) support.
@@ -2487,4 +2489,3 @@ export class IgxCustomFilteringOperand extends IgxFilteringOperand {
     - `IgxDraggableDirective` moved inside `../directives/dragdrop/` folder
     - `IgxRippleDirective` moved inside `../directives/ripple/` folder
     - Folder `"./navigation/nav-service"` renamed to `"./navigation/nav.service"`
-

projects/igniteui-angular/src/lib/calendar/calendar-base.ts

@@ -620,7 +620,7 @@ export class IgxCalendarBaseDirective implements ControlValueAccessor {
      * Deselects date(s) (based on the selection type).
      */
     public deselectDate(value?: Date | Date[]) {
-        if (this.selectedDates === null || this.selectedDates.length === 0) {
+        if (!this.selectedDates || this.selectedDates.length === 0) {
             return;
         }
 

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

@@ -314,6 +314,7 @@ Setting `[displayDensity]` affects the control's items' and inputs' css properti
 |  `type`                  | Combo style. - "line", "box", "border", "search"                                        | string                      |
 |  `valid`                 | gets if control is valid, when used in a form     | boolean                     |
 |  `overlaySettings`       | gets/sets the custom overlay settings that control how the drop-down list displays | OverlaySettings         |
+|  `autoFocusSearch`     | controls whether the search input should be focused when the combo is opened | boolean |
 
 ### Getters
 | Name                     | Description                                       | Type                        |

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

@@ -149,6 +149,24 @@ describe('igxCombo', () => {
             expect(combo.dropdown.toggle).toHaveBeenCalledTimes(1);
             expect(combo.collapsed).toBe(false);
         });
+        it(`should not focus search input when property autoFocusSearch=false`, () => {
+            combo = new IgxComboComponent({ nativeElement: null }, mockCdr, mockSelection as any, mockComboService, null, mockInjector);
+            const dropdownContainer = { nativeElement: { focus: () => {}}};
+            combo['dropdownContainer'] = dropdownContainer;
+            spyOn(combo, 'focusSearchInput');
+
+            combo.autoFocusSearch = false;
+            combo.handleOpened();
+            expect(combo.focusSearchInput).toHaveBeenCalledTimes(0);
+
+            combo.autoFocusSearch = true;
+            combo.handleOpened();
+            expect(combo.focusSearchInput).toHaveBeenCalledTimes(1);
+
+            combo.autoFocusSearch = false;
+            combo.handleOpened();
+            expect(combo.focusSearchInput).toHaveBeenCalledTimes(1);
+        });
         it('should call dropdown toggle with correct overlaySettings', () => {
             combo = new IgxComboComponent({ nativeElement: null }, mockCdr, mockSelection as any, mockComboService, null, mockInjector);
             const dropdown = jasmine.createSpyObj('IgxComboDropDownComponent', ['toggle']);
@@ -788,6 +806,19 @@ describe('igxCombo', () => {
             fixture.detectChanges();
             expect(combo.searchInput).toBeFalsy();
         });
+        it('should focus search input', fakeAsync(() => {
+            combo.toggle();
+            tick();
+            fixture.detectChanges();
+            expect(document.activeElement).toEqual(combo.searchInput.nativeElement);
+        }));
+        it('should not focus search input, when autoFocusSearch=false', fakeAsync(() => {
+            combo.autoFocusSearch = false;
+            combo.toggle();
+            tick();
+            fixture.detectChanges();
+            expect(document.activeElement).not.toEqual(combo.searchInput.nativeElement);
+        }));
         it('should properly initialize templates', () => {
             expect(combo).toBeDefined();
             expect(combo.footerTemplate).toBeDefined();
@@ -983,7 +1014,7 @@ describe('igxCombo', () => {
 
             productIndex = 485;
             combo.virtualScrollContainer.scrollTo(productIndex);
-            await wait();
+            await wait(30);
             fixture.detectChanges();
             verifyComboData();
             expect(combo.virtualizationState.startIndex + combo.virtualizationState.chunkSize - 1)

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

@@ -813,6 +813,14 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
     @Input()
     public type = 'box';
 
+    /**
+     * An @Input property that controls whether the combo's search box
+     * should be focused after the `onOpened` event is called
+     * When `false`, the combo's list item container will be focused instead
+     */
+    @Input()
+    public autoFocusSearch = true;
+
     /**
      * Gets if control is valid, when used in a form
      *
@@ -1480,7 +1488,15 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
      */
     public handleOpened() {
         this.triggerCheck();
-        this.focusSearchInput(true);
+
+        // Disabling focus of the search input should happen only when drop down opens.
+        // During keyboard navigation input should receive focus, even the autoFocusSearch is disabled.
+        // That is why in such cases focusing of the dropdownContainer happens outside focusSearchInput method.
+        if (this.autoFocusSearch) {
+            this.focusSearchInput(true);
+        } else {
+            this.dropdownContainer.nativeElement.focus();
+        }
         this.onOpened.emit();
     }
 

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

@@ -1,25 +1,42 @@
 <ng-template #readOnlyDatePickerTemplate>
-    <igx-input-group (click)="openDialog()">
+    <igx-input-group (click)="openDialog()" (mousedown)="mouseDown($event)">
         <igx-prefix>
             <igx-icon>today</igx-icon>
         </igx-prefix>
         <label *ngIf="labelVisibility" igxLabel>{{label}}</label>
-        <input #readonlyInput class="igx-date-picker__input-date" igxInput [value]="displayData || ''"
-            [disabled]="disabled" readonly />
+        <input
+            class="igx-date-picker__input-date"
+            igxInput
+            [value]="displayData || ''"
+            [disabled]="disabled"
+            (blur)="onBlur($event)"
+            readonly
+        />
     </igx-input-group>
 </ng-template>
 
 <ng-template #editableDatePickerTemplate>
-    <igx-input-group #editableInputGroup [supressInputAutofocus]="true">
+    <igx-input-group #editableInputGroup [supressInputAutofocus]="true" (mousedown)="mouseDown($event)">
         <igx-prefix (click)="openDialog(editableInputGroup.element.nativeElement)">
             <igx-icon>today</igx-icon>
         </igx-prefix>
         <label *ngIf="labelVisibility" igxLabel>{{label}}</label>
-        <input #editableInput class="igx-date-picker__input-date" igxInput [igxTextSelection]="true"
-            type="text" [value]="transformedDate"
-            [igxMask]="inputMask" [placeholder]="mask" [disabled]="disabled" [displayValuePipe]="displayValuePipe"
-            [focusedValuePipe]="inputValuePipe" (blur)="onBlur($event)" (wheel)="onWheel($event)"
-            (input)="onInput($event)" (focus)="onFocus()" />
+        <input
+            class="igx-date-picker__input-date"
+            igxInput
+            [igxTextSelection]="true"
+            type="text"
+            [value]="transformedDate"
+            [igxMask]="inputMask"
+            [placeholder]="mask"
+            [disabled]="disabled"
+            [displayValuePipe]="displayValuePipe"
+            [focusedValuePipe]="inputValuePipe"
+            (blur)="onBlur($event)"
+            (wheel)="onWheel($event)"
+            (input)="onInput($event)"
+            (focus)="onFocus()"
+        />
         <igx-suffix *ngIf="!isEmpty" (click)="clear()">
             <igx-icon>clear</igx-icon>
         </igx-suffix>

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

@@ -1,19 +1,20 @@
-import { Component, ViewChild, ElementRef } from '@angular/core';
+import { Component, ViewChild, ElementRef, EventEmitter } from '@angular/core';
 import { async, fakeAsync, TestBed, tick, flush, ComponentFixture } from '@angular/core/testing';
-import { FormsModule, FormGroup, FormBuilder, FormControl, ReactiveFormsModule } from '@angular/forms';
+import { FormsModule, FormGroup, FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxDatePickerComponent, IgxDatePickerModule } from './date-picker.component';
 import { IgxLabelDirective } from '../directives/label/label.directive';
-import { IgxInputDirective } from '../directives/input/input.directive';
+import { IgxInputDirective, IgxInputState } from '../directives/input/input.directive';
 import { UIInteractions, wait } from '../test-utils/ui-interactions.spec';
-import { IgxInputGroupModule } from '../input-group';
+import { IgxInputGroupModule, IgxInputGroupComponent } from '../input-group';
 import { IgxTextSelectionModule } from '../directives/text-selection/text-selection.directive';
 import { configureTestSuite } from '../test-utils/configure-suite';
 import { IgxButtonModule } from '../directives/button/button.directive';
 import { IgxCalendarModule } from '../calendar';
 import { InteractionMode } from '../core/enums';
 import { DateRangeType } from '../core/dates/dateRange';
+import { OverlayCancelableEventArgs, OverlayEventArgs, OverlayClosingEventArgs, HorizontalAlignment, VerticalAlignment } from '../services';
 
 describe('IgxDatePicker', () => {
     configureTestSuite();
@@ -1260,38 +1261,133 @@ describe('IgxDatePicker', () => {
 
     describe('Reactive form', () => {
         let fixture: ComponentFixture<IgxDatePickerReactiveFormComponent>;
-        let datePicker: IgxDatePickerComponent;
+        let datePickerOnChangeComponent: IgxDatePickerComponent;
+        let datePickerOnBlurComponent: IgxDatePickerComponent;
 
         beforeEach(() => {
             fixture = TestBed.createComponent(IgxDatePickerReactiveFormComponent);
-            datePicker = fixture.componentInstance.datePicker;
+            datePickerOnChangeComponent = fixture.componentInstance.datePickerOnChangeComponent;
+            datePickerOnBlurComponent = fixture.componentInstance.datePickerOnBlurComponent;
             fixture.detectChanges();
         });
 
-        // Bug #6025 Date picker does not disable in reactive form
-        it('Should disable when form is disabled', fakeAsync(() => {
+        it('Should set date picker status to invalid when it is required and has no value', fakeAsync(() => {
+            const inputGroupsElements = fixture.debugElement.queryAll(By.directive(IgxInputDirective));
+            const inputGroupElement = inputGroupsElements.find(d => d.componentInstance === datePickerOnChangeComponent);
+            const inputDirective = inputGroupElement.injector.get(IgxInputDirective) as IgxInputDirective;
+
+            expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);
+
+            datePickerOnChangeComponent.value = null;
             fixture.detectChanges();
-            const formGroup: FormGroup = fixture.componentInstance.reactiveForm;
-            const inputGroup = fixture.debugElement.query(By.css('.igx-input-group'));
 
-            inputGroup.nativeElement.click();
-            tick();
+            expect(inputDirective.valid).toEqual(IgxInputState.INVALID);
+        }));
+
+        it('Should set date picker status to invalid when it is required and has no value onBlur', fakeAsync(() => {
+            datePickerOnBlurComponent.mode = InteractionMode.DropDown;
+            datePickerOnBlurComponent.mask = 'dd/mm/yyyy';
+            datePickerOnBlurComponent.inputMask = 'dd/mm/yyyy';
             fixture.detectChanges();
-            expect(datePicker.collapsed).toBeFalsy();
 
-            datePicker.closeCalendar();
+            const inputDirectiveElements = fixture.debugElement.queryAll(By.directive(IgxInputDirective));
+            const inputDirectiveElement = inputDirectiveElements.find(d => d.componentInstance === datePickerOnBlurComponent);
+            const inputDirective = inputDirectiveElement.injector.get(IgxInputDirective) as IgxInputDirective;
+
+            expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);
+
+            inputDirectiveElement.triggerEventHandler('focus', {});
             fixture.detectChanges();
 
-            formGroup.disable();
-            tick();
+            expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);
+
+            datePickerOnBlurComponent.value = null;
             fixture.detectChanges();
+            expect(inputDirective.valid).toEqual(IgxInputState.INITIAL);
 
-            inputGroup.nativeElement.click();
-            tick();
+            inputDirectiveElement.triggerEventHandler('blur', { target: { value: ''}});
             fixture.detectChanges();
-            const dateDropDown = document.getElementsByClassName('igx-date-picker--dropdown');
-            expect(dateDropDown.length).toEqual(0);
+
+            expect(inputDirective.valid).toEqual(IgxInputState.INVALID);
         }));
+
+        // Bug #6025 Date picker does not disable in reactive form
+        it('Should disable when form is disabled', () => {
+            const formGroup: FormGroup = fixture.componentInstance.reactiveForm;
+            const inputGroupsElements = fixture.debugElement.queryAll(By.directive(IgxInputDirective));
+            const inputGroupElement = inputGroupsElements.find(d => d.componentInstance === datePickerOnBlurComponent);
+            const inputDirective = inputGroupElement.injector.get(IgxInputDirective) as IgxInputDirective;
+            expect(inputDirective.disabled).toBeFalsy();
+
+            formGroup.disable();
+            fixture.detectChanges();
+            expect(inputDirective.disabled).toBeTruthy();
+        });
+    });
+
+    describe('Control value accessor unit tests', () => {
+        let ngModel;
+        let overlay;
+        let element;
+        let cdr;
+        let moduleRef;
+        let injector;
+        let inputGroup: IgxInputGroupComponent;
+
+        beforeEach(() => {
+            ngModel = {
+                control: { touched: false, dirty: false, validator: null },
+                valid: false,
+                statusChanges: new EventEmitter(),
+            };
+            overlay = {
+                onOpening: new EventEmitter<OverlayCancelableEventArgs>(),
+                onOpened: new EventEmitter<OverlayEventArgs>(),
+                onClosed: new EventEmitter<OverlayEventArgs>(),
+                onClosing: new EventEmitter<OverlayClosingEventArgs>()
+            };
+            element = {};
+            cdr = {
+                markForCheck: () => {},
+                detectChanges: () => {},
+                detach: () => {},
+                reattach: () => {}
+            };
+            moduleRef = {};
+            injector = { get: () => ngModel };
+            inputGroup = new IgxInputGroupComponent(null, null);
+        });
+
+        it('should initialize date picker with required correctly', () => {
+            const datePicker = new IgxDatePickerComponent(overlay, element, cdr, moduleRef, injector);
+            datePicker['inputGroup'] = inputGroup;
+            ngModel.control.validator = () => ({ required: true});
+            datePicker.ngOnInit();
+            datePicker.ngAfterViewInit();
+            datePicker.ngAfterViewChecked();
+
+            expect(datePicker).toBeDefined();
+            expect(inputGroup.isRequired).toBeTruthy();
+        });
+
+        it('should update inputGroup isRequired correctly', () => {
+            const datePicker = new IgxDatePickerComponent(overlay, element, cdr, moduleRef, injector);
+            datePicker['inputGroup'] = inputGroup;
+            datePicker.ngOnInit();
+            datePicker.ngAfterViewInit();
+            datePicker.ngAfterViewChecked();
+
+            expect(datePicker).toBeDefined();
+            expect(inputGroup.isRequired).toBeFalsy();
+
+            ngModel.control.validator = () => ({ required: true});
+            ngModel.statusChanges.emit();
+            expect(inputGroup.isRequired).toBeTruthy();
+
+            ngModel.control.validator = () => ({ required: false});
+            ngModel.statusChanges.emit();
+            expect(inputGroup.isRequired).toBeFalsy();
+        });
     });
 });
 
@@ -1442,23 +1538,27 @@ export class IgxDatePickerOpeningComponent {
 @Component({
     template: `
     <form [formGroup]="reactiveForm">
-    <p>
-        <igx-date-picker formControlName="datePickerReactive" #datePickerReactive></igx-date-picker>
-    </p>
-</form>
+        <igx-date-picker formControlName="datePickerOnChange" #datePickerOnChangeComponent></igx-date-picker>
+        <igx-date-picker formControlName="datePickerOnBlur" #datePickerOnBlurComponent></igx-date-picker>
+    </form>
 `
 })
 class IgxDatePickerReactiveFormComponent {
-    @ViewChild('datePickerReactive', { read: IgxDatePickerComponent, static: true })
-    public datePicker: IgxDatePickerComponent;
+    @ViewChild('datePickerOnChangeComponent', { read: IgxDatePickerComponent, static: true })
+    public datePickerOnChangeComponent: IgxDatePickerComponent;
+
+    @ViewChild('datePickerOnBlurComponent', { read: IgxDatePickerComponent, static: true })
+    public datePickerOnBlurComponent: IgxDatePickerComponent;
+
     reactiveForm: FormGroup;
 
     constructor(fb: FormBuilder) {
+        const date = new Date(2000, 10, 15);
         this.reactiveForm = fb.group({
-            datePickerReactive: new FormControl(''),
+            datePickerOnChange: [date, Validators.required],
+            datePickerOnBlur: [date, { updateOn: 'blur', validators: Validators.required}]
         });
     }
-    onSubmitReactive() { }
 }
 
 @Component({