Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(date-picker): Date picker outlet removed #5133

Merged
merged 7 commits into from
Jun 21, 2019
Merged

fix(date-picker): Date picker outlet removed #5133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a093937
fix(date-picker): Date picker outlet removed #5090
sboykova Jun 20, 2019
be864ab
Merge branch 'master' into sboykova/DP-outlet-removed-m
SAndreeva Jun 20, 2019
edf3cc8
fix(date-picker): Added comment for outlet input #5133
sboykova Jun 20, 2019
dc1d660
Merge branch 'master' into sboykova/DP-outlet-removed-m
sboykova Jun 20, 2019
1d6d8d2
fix(date-picker): Fixed failing tests #5133
sboykova Jun 20, 2019
7baf9f1
Merge branch '8.0.x' into sboykova/DP-outlet-removed-m
kdinev Jun 21, 2019
a85838c
Merge branch '8.0.x' into sboykova/DP-outlet-removed-m
rkaraivanov Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions projects/igniteui-angular/src/lib/date-picker/date-picker.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@
</igx-input-group>
</ng-template>

<ng-container *ngTemplateOutlet="template; context: context"></ng-container>
<div igxOverlayOutlet #datePickerOutlet></div>
<ng-container *ngTemplateOutlet="template; context: context"></ng-container>
22 changes: 11 additions & 11 deletions projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ describe('IgxDatePicker', () => {

const buttons = document.getElementsByClassName('igx-button--flat');
expect(buttons.length).toEqual(1);
expect((buttons[0]as HTMLElement).innerText).toBe('TEST');
expect((buttons[0] as HTMLElement).innerText).toBe('TEST');
});

it('Retemplated calendar in date picker - dropdown mode', () => {
Expand All @@ -302,7 +302,7 @@ describe('IgxDatePicker', () => {

const buttons = document.getElementsByClassName('igx-button--flat');
expect(buttons.length).toEqual(1);
expect((buttons[0]as HTMLElement).innerText).toBe('TEST');
expect((buttons[0] as HTMLElement).innerText).toBe('TEST');
});

it('locale propagate calendar value (de-DE)', () => {
Expand Down Expand Up @@ -429,7 +429,7 @@ describe('IgxDatePicker', () => {
UIInteractions.clickElement(target);
fixture.detectChanges();

let year = fixture.debugElement.nativeElement.getElementsByClassName('igx-calendar-picker__date')[1];
let year = document.getElementsByClassName('igx-calendar-picker__date')[1];
year.dispatchEvent(new Event('click'));
tick();
fixture.detectChanges();
Expand All @@ -440,8 +440,8 @@ describe('IgxDatePicker', () => {
tick();
fixture.detectChanges();

year = fixture.debugElement.nativeElement.getElementsByClassName('igx-calendar-picker__date')[1];
expect(year.innerText).toBe(expectedResult);
year = document.getElementsByClassName('igx-calendar-picker__date')[1];
expect((year as HTMLElement).innerText).toBe(expectedResult);
}));

it('#3595 - Should be able to change month', fakeAsync(() => {
Expand All @@ -456,7 +456,7 @@ describe('IgxDatePicker', () => {
tick(200);
fixture.detectChanges();

let month = fixture.debugElement.nativeElement.getElementsByClassName('igx-calendar-picker__date')[0];
let month = document.getElementsByClassName('igx-calendar-picker__date')[0];
month.dispatchEvent(new Event('click'));
tick(200);
fixture.detectChanges();
Expand All @@ -468,8 +468,8 @@ describe('IgxDatePicker', () => {
tick(200);
fixture.detectChanges();

month = fixture.debugElement.nativeElement.getElementsByClassName('igx-calendar-picker__date')[0];
expect(month.innerText.trim()).toBe(expectedResult.trim());
month = document.getElementsByClassName('igx-calendar-picker__date')[0];
expect((month as HTMLElement).innerText.trim()).toBe(expectedResult.trim());
}));

describe('Drop-down opening', () => {
Expand Down Expand Up @@ -718,11 +718,11 @@ describe('IgxDatePicker', () => {
const dropDown = dom.query(By.css('.igx-date-picker--dropdown'));
expect(dropDown).toBeDefined();

const selectedSpans = dom.nativeElement.getElementsByClassName('igx-calendar__date--selected');
const selectedSpans = document.getElementsByClassName('igx-calendar__date--selected');
expect(selectedSpans.length).toBe(1);
expect(selectedSpans[0].innerText.trim()).toBe('20');
expect((selectedSpans[0] as HTMLElement).innerText.trim()).toBe('20');

const dateHeader = dom.nativeElement.getElementsByClassName('igx-calendar-picker__date');
const dateHeader = document.getElementsByClassName('igx-calendar-picker__date');
expect(dateHeader.length).toBe(2);
const month = dateHeader[0].innerHTML.trim();
const year = dateHeader[1].innerHTML.trim();
Expand Down
23 changes: 12 additions & 11 deletions projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,16 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
public isSpinLoop = true;

/**
*@hidden
*/
* Determines the container the popup element should be attached to.
*
* ```html
* <div igxOverlayOutlet #outlet="overlay-outlet"></div>
* //..
* <igx-date-picker [outlet]="outlet"></igx-date-picker>
* //..
* ```
* Where `outlet` is an instance of `IgxOverlayOutletDirective` or an `ElementRef`.
*/
@Input()
public outlet: IgxOverlayOutletDirective | ElementRef;

Expand Down Expand Up @@ -631,12 +639,6 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
@Output()
public onValidationFailed = new EventEmitter<IDatePickerValidationFailedEventArgs>();

/**
* @hidden
*/
@ViewChild('datePickerOutlet', { read: ElementRef, static: true })
public outletDirective: ElementRef;

/*
* @hidden
*/
Expand Down Expand Up @@ -794,19 +796,18 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
closeAnimation: fadeOut
};

const outlet = (this.outlet !== undefined) ? this.outlet : this.outletDirective;
this._defaultDropDownOverlaySettings = {
closeOnOutsideClick: true,
modal: false,
scrollStrategy: new AbsoluteScrollStrategy(),
positionStrategy: new AutoPositionStrategy(this._positionSettings),
outlet: outlet
outlet: this.outlet
};

this._modalOverlaySettings = {
closeOnOutsideClick: true,
modal: true,
outlet: outlet
outlet: this.outlet
};

this._overlayService.onOpening.pipe(
Expand Down
2 changes: 1 addition & 1 deletion ...ui-angular/src/lib/grids/filtering/excel-style/excel-style-date-expression.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/>
</igx-input-group>

<igx-date-picker #datePicker mode="dropdown" [(ngModel)]="expressionUI.expression.searchVal" [locale]="grid.locale">
<igx-date-picker #datePicker mode="dropdown" [(ngModel)]="expressionUI.expression.searchVal" [locale]="grid.locale" [outlet]="grid.outletDirective">
<ng-template igxDatePickerTemplate let-openDialog="openDialog" let-value="value">
<igx-input-group #dropDownTarget type="box" [displayDensity]="displayDensity" [supressInputAutofocus]="true">
<input #input
Expand Down
Loading