Skip to content

Update calendar with two filled in inputs - master #7640

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

Merged
Lipata merged 1 commit into from
Jun 22, 2020
Merged

Update calendar with two filled in inputs - master #7640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,34 @@ describe('IgxDateRangePicker', () => {
fixture.detectChanges();
verifyDateRange();
});

it('should select a range from the calendar only when the two inputs are filled in', fakeAsync(() => {
fixture.componentInstance.mode = InteractionMode.DropDown;
fixture.detectChanges();

startInput.triggerEventHandler('focus', {});
fixture.detectChanges();
UIInteractions.simulateTyping('11/10/2015', startInput);

fixture.componentInstance.dateRange.open();
tick();
fixture.detectChanges();
expect(fixture.componentInstance.dateRange.calendar.selectedDates.length).toBe(0);

UIInteractions.triggerEventHandlerKeyDown('Escape', calendar);
tick();
fixture.detectChanges();

endInput.triggerEventHandler('focus', {});
fixture.detectChanges();
UIInteractions.simulateTyping('11/16/2015', endInput);
fixture.detectChanges();

fixture.componentInstance.dateRange.open();
tick();
fixture.detectChanges();
expect(fixture.componentInstance.dateRange.calendar.selectedDates.length).toBe(7);
}));
});

describe('Keyboard navigation', () => {
Expand Down
93 changes: 63 additions & 30 deletions projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,11 +570,23 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase
public validate(control: AbstractControl): ValidationErrors | null {
const value: DateRange = control.value;
if (value) {
// TODO (in issue #7477)
// Accumulate all errors and return them as one object.
if (this.hasProjectedInputs) {
const startInput = this.projectedInputs.find(i => i instanceof IgxDateRangeStartComponent) as IgxDateRangeStartComponent;
const endInput = this.projectedInputs.find(i => i instanceof IgxDateRangeEndComponent) as IgxDateRangeEndComponent;
if (!startInput.dateTimeEditor.value) {
return { 'startValue': true };
}
if (!endInput.dateTimeEditor.value) {
return { 'endValue': true };
}
}

const min = DatePickerUtil.parseDate(this.minValue);
const max = DatePickerUtil.parseDate(this.maxValue);
const start = DatePickerUtil.parseDate(value.start);
const end = DatePickerUtil.parseDate(value.end);

if (min && start && DatePickerUtil.lessThanMinValue(start, min, false)) {
return { 'minValue': true };
}
Expand All @@ -589,7 +601,6 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase
}
}

// TODO: fix what happens on blur and ensure on blur the value is either null or with both start and end filled
return null;
}

Expand Down Expand Up @@ -676,15 +687,12 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase

/** @hidden @internal */
public handleClosing(event: CancelableBrowserEventArgs & IBaseEventArgs): void {
this.onClosing.emit(event);

if (this.value && this.value.start && !this.value.end) {
this.value = { start: this.value.start, end: this.value.start };
}
if (this.value && !this.value.start && !this.value.end) {
this.value = null;
}

this.onClosing.emit(event);

if (this.mode === InteractionMode.DropDown && event.event && !this.element.nativeElement.contains(event.event.target)) {
// outside click
this.updateValidityOnBlur();
Expand Down Expand Up @@ -790,46 +798,77 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase
});
}

private updateCalendar(): void {
this.calendar.disabledDates = [];
let minValue: Date = DatePickerUtil.parseDate(this.minValue);
private parseMinValue(value: string | Date): Date | null {
let minValue: Date = DatePickerUtil.parseDate(value);
if (!minValue && this.hasProjectedInputs) {
const start = this.projectedInputs.filter(i => i instanceof IgxDateRangeStartComponent)[0];
if (start) {
minValue = DatePickerUtil.parseDate(start.dateTimeEditor.minValue);
}
}
if (minValue) {
this.calendar.disabledDates.push({ type: DateRangeType.Before, dateRange: [minValue] });
}

let maxValue: Date = DatePickerUtil.parseDate(this.maxValue);
if (!maxValue && this.hasProjectedInputs) {
return minValue;
}

private parseMaxValue(value: string | Date): Date | null {
let maxValue: Date = DatePickerUtil.parseDate(value);
if (!maxValue && this.projectedInputs) {
const end = this.projectedInputs.filter(i => i instanceof IgxDateRangeEndComponent)[0];
if (end) {
maxValue = DatePickerUtil.parseDate(end.dateTimeEditor.maxValue);
}
}

return maxValue;
}

private updateCalendar(): void {
this.calendar.disabledDates = [];
const minValue = this.parseMinValue(this.minValue);
if (minValue) {
this.calendar.disabledDates.push({ type: DateRangeType.Before, dateRange: [minValue] });
}
const maxValue = this.parseMaxValue(this.maxValue);
if (maxValue) {
this.calendar.disabledDates.push({ type: DateRangeType.After, dateRange: [maxValue] });
}

const range: Date[] = [];
if (this.value) {
if (this.value.start) {
range.push(this.value.start);
if (this.value?.start && this.value?.end) {
if (DatePickerUtil.greaterThanMaxValue(this.value.start, this.value.end)) {
this.swapEditorDates();
}
if (this.value.end) {
range.push(this.value.end);
if (this.valueInRange(this.value, minValue, maxValue)) {
range.push(this.value.start, this.value.end);
}
}

if (range.length > 0) {
this.calendar.selectDate(range);
this.calendar.viewDate = range[0];
} else {
this.calendar.deselectDate();
}
this.calendar.viewDate = range[0] || new Date();
}

private swapEditorDates(): void {
if (this.hasProjectedInputs) {
const start = this.projectedInputs.find(i => i instanceof IgxDateRangeStartComponent) as IgxDateRangeStartComponent;
const end = this.projectedInputs.find(i => i instanceof IgxDateRangeEndComponent) as IgxDateRangeEndComponent;
[start.dateTimeEditor.value, end.dateTimeEditor.value] = [end.dateTimeEditor.value, start.dateTimeEditor.value];
[this.value.start, this.value.end] = [this.value.end, this.value.start];
}
}

private valueInRange(value: DateRange, minValue?: Date, maxValue?: Date): boolean {
if (minValue && DatePickerUtil.lessThanMinValue(value.start, minValue, false)) {
return false;
}
if (maxValue && DatePickerUtil.greaterThanMaxValue(value.end, maxValue, false)) {
return false;
}

return true;
}

private extractRange(selection: Date[]): DateRange {
Expand Down Expand Up @@ -858,7 +897,6 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase
} else {
this.value = { start: value, end: null };
}
// TODO: should we check start and reset end value
});
end.dateTimeEditor.valueChange
.pipe(takeUntil(this.$destroy))
Expand All @@ -882,11 +920,6 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase
if (this.collapsed) {
this.updateValidityOnBlur();
}
if (this.value && !this.value.start) {
this.value = null;
}
// TODO: if we have start and have no end should we fill end
// as we do on calendar close
});
});
} else {
Expand Down Expand Up @@ -942,9 +975,9 @@ export class IgxDateRangePickerComponent extends DisplayDensityBase
private updateInputs(): void {
const start = this.projectedInputs?.find(i => i instanceof IgxDateRangeStartComponent) as IgxDateRangeStartComponent;
const end = this.projectedInputs?.find(i => i instanceof IgxDateRangeEndComponent) as IgxDateRangeEndComponent;
if (start && end && this.value) {
start.updateInputValue(this.value.start);
end.updateInputValue(this.value.end);
if (start && end) {
start.updateInputValue(this.value?.start ?? null);
end.updateInputValue(this.value?.end ?? null);
}
}
}