Skip to content

Commit ed1c117

Browse files
committed
feat(overlay): show date pickers in place
1 parent 70c6ec1 commit ed1c117

4 files changed

Lines changed: 13 additions & 14 deletions

File tree

projects/igniteui-angular/calendar/src/calendar/calendar-multi-view.component.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ describe('Multi-View Calendar - ', () => {
10451045
tick(400);
10461046
fixture.detectChanges();
10471047

1048-
let overlay = document.querySelector(HelperTestFunctions.OVERLAY_CSSCLASS);
1048+
let overlay = document.querySelector(HelperTestFunctions.CALENDAR_WRAPPER_CLASS);
10491049
HelperTestFunctions.verifyMonthsViewNumber(overlay, 3);
10501050
HelperTestFunctions.verifyCalendarSubHeaders(overlay, [ymd('2019-09-16'), ymd('2019-10-16'), ymd('2019-11-16')]);
10511051

@@ -1064,7 +1064,7 @@ describe('Multi-View Calendar - ', () => {
10641064
tick(400);
10651065
fixture.detectChanges();
10661066

1067-
overlay = document.querySelector(HelperTestFunctions.OVERLAY_CSSCLASS);
1067+
overlay = document.querySelector(HelperTestFunctions.CALENDAR_WRAPPER_CLASS);
10681068
HelperTestFunctions.verifyMonthsViewNumber(overlay, 2);
10691069
HelperTestFunctions.verifyCalendarSubHeaders(overlay, [ymd('2019-09-16'), ymd('2019-10-16')]);
10701070

@@ -1079,7 +1079,7 @@ describe('Multi-View Calendar - ', () => {
10791079
fixture.detectChanges();
10801080

10811081
expect(datePicker.hideOutsideDays).toBe(true);
1082-
let overlay = document.querySelector(HelperTestFunctions.OVERLAY_CSSCLASS);
1082+
let overlay = document.querySelector(HelperTestFunctions.CALENDAR_WRAPPER_CLASS);
10831083
expect(HelperTestFunctions.getHiddenDays(overlay, 0).length).toBe(HelperTestFunctions.getInactiveDays(overlay, 0).length);
10841084
expect(HelperTestFunctions.getHiddenDays(overlay, 1).length).toBe(HelperTestFunctions.getInactiveDays(overlay, 1).length);
10851085
expect(HelperTestFunctions.getHiddenDays(overlay, 2).length).toBe(HelperTestFunctions.getInactiveDays(overlay, 2).length);
@@ -1098,7 +1098,7 @@ describe('Multi-View Calendar - ', () => {
10981098
fixture.detectChanges();
10991099

11001100
expect(datePicker.hideOutsideDays).toBe(false);
1101-
overlay = document.querySelector(HelperTestFunctions.OVERLAY_CSSCLASS);
1101+
overlay = document.querySelector(HelperTestFunctions.CALENDAR_WRAPPER_CLASS);
11021102
expect(HelperTestFunctions.getHiddenDays(overlay, 0).length).toBe(12);
11031103
expect(HelperTestFunctions.getHiddenDays(overlay, 1).length).toBe(11);
11041104
expect(HelperTestFunctions.getHiddenDays(overlay, 2).length).toBe(5);

projects/igniteui-angular/date-picker/src/date-picker/calendar-container/calendar-container.component.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ export class IgxCalendarContainerComponent {
6161
public mode: PickerInteractionMode = PickerInteractionMode.DropDown;
6262
public pickerActions: IgxPickerActionsDirective;
6363

64-
@HostListener('keydown.alt.arrowup', ['$event'])
65-
public onEscape(event) {
66-
event.preventDefault();
67-
this.calendarClose.emit();
68-
}
69-
7064
public get isReadonly() {
7165
return this.mode === PickerInteractionMode.Dialog;
7266
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,14 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
506506
positionStrategy: new AutoPositionStrategy({
507507
openAnimation: fadeIn,
508508
closeAnimation: fadeOut
509-
})
509+
}),
510+
keepInPlace: true
510511
};
511512
private _dialogOverlaySettings: OverlaySettings = {
512513
closeOnOutsideClick: true,
513514
modal: true,
514-
closeOnEscape: true
515+
closeOnEscape: true,
516+
keepInPlace: true
515517
};
516518
private _calendarFormat: IFormattingOptions = {
517519
day: 'numeric',

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,12 +644,14 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
644644
private _dialogOverlaySettings: OverlaySettings = {
645645
closeOnOutsideClick: true,
646646
modal: true,
647-
closeOnEscape: true
647+
closeOnEscape: true,
648+
keepInPlace: true
648649
};
649650
private _dropDownOverlaySettings: OverlaySettings = {
650651
closeOnOutsideClick: true,
651652
modal: false,
652-
closeOnEscape: true
653+
closeOnEscape: true,
654+
keepInPlace: true
653655
};
654656
private onChangeCallback: (dateRange: DateRange) => void = noop;
655657
private onTouchCallback: () => void = noop;
@@ -960,6 +962,7 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
960962
private handleClosing(e: IBaseCancelableBrowserEventArgs): void {
961963
const args = { owner: this, cancel: e?.cancel, event: e?.event };
962964
this.closing.emit(args);
965+
console.log('closing', args);
963966
e.cancel = args.cancel;
964967
if (args.cancel) {
965968
return;

0 commit comments

Comments
 (0)