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

Jump to bottom

fix(datepicker): model should be prestine on init from ngModel #3115

Merged
merged 1 commit into from
Nov 27, 2017
Merged

fix(datepicker): model should be prestine on init from ngModel #3115

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
33 changes: 20 additions & 13 deletions src/datepicker/bs-datepicker-input.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
ChangeDetectorRef,
Directive, ElementRef, forwardRef, Host, OnInit, Renderer2
} from '@angular/core';
import { ChangeDetectorRef, Directive, ElementRef, forwardRef, Host, Renderer2 } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { BsDatepickerComponent } from './bs-datepicker.component';
import { formatDate } from '../bs-moment/format';
Expand All @@ -27,34 +24,41 @@ export class BsDatepickerInputDirective
implements ControlValueAccessor {
private _onChange = Function.prototype;
private _onTouched = Function.prototype;
private _value: Date;

constructor(@Host() private _picker: BsDatepickerComponent,
private _renderer: Renderer2,

private _elRef: ElementRef,
private changeDetection: ChangeDetectorRef) {
this._picker.bsValueChange.subscribe((v: Date) => this._setInputValue(v));
this._picker.bsValueChange.subscribe((value: Date) => {
this._setInputValue(value);
if (this._value !== value) {
this._value = value;
this._onChange(value);
this._onTouched();
}
this.changeDetection.markForCheck();
});
}

_setInputValue(v: Date): void {
_setInputValue(value: Date): void {
const initialDate = formatDate(
v,
value,
this._picker._config.dateInputFormat,
this._picker._config.locale
) || '';
this._renderer.setProperty(this._elRef.nativeElement, 'value', initialDate);
this._onChange(v);
this.changeDetection.markForCheck();
}

onChange(event: any) {
this.writeValue(event.target.value);
this._onChange(this._value);
this._onTouched();
}

writeValue(value: Date | string) {
if (!value) {
this._picker.bsValue = null;
this._value = null;
}
const _locale = getLocale(this._picker._config.locale);
if (!_locale) {
Expand All @@ -65,18 +69,21 @@ export class BsDatepickerInputDirective
}
if (typeof value === 'string') {
const date = new Date(_locale.preparse(value));
this._picker.bsValue = isNaN(date.valueOf()) ? null : date;
this._value = isNaN(date.valueOf()) ? null : date;
}

if (value instanceof Date) {
this._picker.bsValue = value;
this._value = value;
}

this._picker.bsValue = this._value;
}

setDisabledState(isDisabled: boolean): void {
this._picker.isDisabled = isDisabled;
if (isDisabled) {
this._renderer.setAttribute(this._elRef.nativeElement, 'disabled', 'disabled');

return;
}
this._renderer.removeAttribute(this._elRef.nativeElement, 'disabled');
Expand Down
25 changes: 18 additions & 7 deletions src/datepicker/bs-daterangepicker-input.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,21 @@ export class BsDaterangepickerInputDirective
implements ControlValueAccessor {
private _onChange = Function.prototype;
private _onTouched = Function.prototype;
private _value: Date[];

constructor(@Host() private _picker: BsDaterangepickerComponent,
private _renderer: Renderer2,
private _elRef: ElementRef,
private changeDetection: ChangeDetectorRef) {
this._picker.bsValueChange.subscribe((v: Date[]) => this._setInputValue(v));
this._picker.bsValueChange.subscribe((value: Date[]) => {
this._setInputValue(value);
if (this._value !== value) {
this._value = value;
this._onChange(value);
this._onTouched();
}
this.changeDetection.markForCheck();
});
}

_setInputValue(date: Date[]): void {
Expand All @@ -48,19 +57,17 @@ export class BsDaterangepickerInputDirective
range = (start && end) ? start + this._picker._config.rangeSeparator + end : '';
}
this._renderer.setProperty(this._elRef.nativeElement, 'value', range);
this._onChange(date);
this.changeDetection.markForCheck();
}

onChange(event: any) {
this.writeValue(event.target.value);
this._onChange(this._value);
this._onTouched();
}

writeValue(value: Date[] | string) {
if (!value) {
this._picker.bsValue = null;
return;
this._value = null;
}

const _locale = getLocale(this._picker._config.locale);
Expand All @@ -70,22 +77,26 @@ export class BsDaterangepickerInputDirective
.locale}" is not defined, please add it with "defineLocale(...)"`
);
}

if (typeof value === 'string') {
this._picker.bsValue = value
this._value = value
.split(this._picker._config.rangeSeparator)
.map(date => new Date(_locale.preparse(date)))
.map(date => (isNaN(date.valueOf()) ? null : date));
}

if (Array.isArray(value)) {
this._picker.bsValue = value;
this._value = value;
}

this._picker.bsValue = this._value;
}

setDisabledState(isDisabled: boolean): void {
this._picker.isDisabled = isDisabled;
if (isDisabled) {
this._renderer.setAttribute(this._elRef.nativeElement, 'disabled', 'disabled');

return;
}
this._renderer.removeAttribute(this._elRef.nativeElement, 'disabled');
Expand Down