Skip to content

fix(datepicker): Changed handling of value change #328

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(datepicker): Changed handling of value change #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c634e3f
fix(datepicker): Changed handling of value change
rastr5189 Nov 29, 2017
a843df8
fix(datepicker): Fixed missing property in DatepickerExampleMinMax do…
rastr5189 Nov 29, 2017
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
2 changes: 2 additions & 0 deletions demo/src/app/pages/modules/datepicker/datepicker.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const exampleMinMaxTemplate = `
<div class="ui left icon input">
<i class="calendar icon"></i>
<input suiDatepicker
[(ngModel)]="date"
[pickerMinDate]="min"
[pickerMaxDate]="max"
[pickerUseNativeOnMobile]="false">
Expand Down Expand Up @@ -205,6 +206,7 @@ export class DatepickerExampleButton {}
export class DatepickerExampleMinMax {
public min:Date;
public max:Date;
public date:Date;

constructor() {
const today = new Date();
Expand Down
11 changes: 6 additions & 5 deletions src/modules/datepicker/directives/datepicker.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export class SuiDatepickerDirective
public set selectedDate(date:Date | undefined) {
this._selectedDate = date;
this.onSelectedDateChange.emit(date);
this.onViewValueChange.emit(date);
}

private _mode:DatepickerMode;
Expand Down Expand Up @@ -104,6 +105,8 @@ export class SuiDatepickerDirective
@Output("pickerValidatorChange")
public onValidatorChange:EventEmitter<void>;

public onViewValueChange:EventEmitter<Date>;

constructor(public renderer:Renderer2,
element:ElementRef,
componentFactory:SuiComponentFactory,
Expand All @@ -125,6 +128,7 @@ export class SuiDatepickerDirective

this.onSelectedDateChange = new EventEmitter<Date>();
this.onValidatorChange = new EventEmitter<void>();
this.onViewValueChange = new EventEmitter<Date>();

this.mode = DatepickerMode.Datetime;
}
Expand Down Expand Up @@ -181,11 +185,8 @@ export class SuiDatepickerDirective
}

public writeValue(value:Date | undefined):void {
this.selectedDate = value;

if (this.componentInstance) {
this.componentInstance.service.selectedDate = value;
}
this._selectedDate = value;
this.onViewValueChange.emit(value);
}

@HostListener("keydown", ["$event"])
Expand Down
14 changes: 9 additions & 5 deletions src/modules/datepicker/directives/input.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class SuiDatepickerInputDirective {
this.fallbackActive = false;

// Whenever the datepicker value updates, update the input text alongside it.
this.datepicker.onSelectedDateChange.subscribe(() =>
this.datepicker.onViewValueChange.subscribe(() =>
this.updateValue(this.selectedDateString));

localizationService.onLanguageUpdate.subscribe(() =>
Expand All @@ -120,14 +120,18 @@ export class SuiDatepickerInputDirective {

if (!value) {
// Delete the selected date if no date was entered manually.
return this.datepicker.writeValue(undefined);
this.datepicker.selectedDate = undefined;
return;
}

const parsed = this.parser.parse(value, this.datepicker.selectedDate);
const parsed:Date = this.parser.parse(value, this.datepicker.selectedDate);

if (!isNaN(parsed.getTime()) && value === this.parser.format(parsed)) {
return this.datepicker.writeValue(parsed);
this.datepicker.selectedDate = parsed;
return;
}
return this.datepicker.writeValue(undefined);

this.datepicker.selectedDate = undefined;
}

@HostListener("focusout")
Expand Down