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(datepicker): update subscriptions of datepicker-inline and daterangepicker-inline #6201

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

fix(datepicker): update subscriptions of datepicker-inline and daterangepicker-inline #6201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6441d26
fix(datepicker): update subscriptions of datepicker-inline and datera…
JoschuaSchneider Jul 8, 2021
7b69d69
Merge branch 'development' into fix-datepicker-inline-subscriptions
daniloff200 Jul 29, 2021
c333dc7
Merge branch 'development' into fix-datepicker-inline-subscriptions
valorkin Aug 20, 2021
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
63 changes: 39 additions & 24 deletions src/datepicker/bs-datepicker-inline.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class BsDatepickerInlineDirective implements OnInit, OnDestroy, OnChanges
* Emits when datepicker value has been changed
*/
@Output() bsValueChange: EventEmitter<Date> = new EventEmitter();
protected _subs: Subscription[] = [];
protected _subs?: Subscription;
private readonly _datepicker: ComponentLoader<BsDatepickerInlineContainerComponent>;
private _datepickerRef?: ComponentRef<BsDatepickerInlineContainerComponent>;

Expand Down Expand Up @@ -110,67 +110,80 @@ export class BsDatepickerInlineDirective implements OnInit, OnDestroy, OnChanges

ngOnInit(): void {
this.setConfig();

// if date changes from external source (model -> view)
this._subs.push(
this.bsValueChange.subscribe((value: Date) => {
if (this._datepickerRef) {
this._datepickerRef.instance.value = value;
}
})
);

// if date changes from picker (view -> model)
if (this._datepickerRef) {
this._subs.push(
this._datepickerRef.instance.valueChange.subscribe((value: Date) => {
this.bsValue = value;
})
);
}
this.updateSubscriptions();
}

ngOnChanges(changes: SimpleChanges): void {
if (!this._datepickerRef || !this._datepickerRef.instance) {
return;
}

let shouldSetConfig = false;

if (changes.minDate) {
this._datepickerRef.instance.minDate = this.minDate;
this.setConfig();
shouldSetConfig = true;
}

if (changes.maxDate) {
this._datepickerRef.instance.maxDate = this.maxDate;
this.setConfig();
shouldSetConfig = true;
}

if (changes.datesDisabled) {
this._datepickerRef.instance.datesDisabled = this.datesDisabled;
this.setConfig();
shouldSetConfig = true;
}

if (changes.datesEnabled) {
this._datepickerRef.instance.datesEnabled = this.datesEnabled;
this._datepickerRef.instance.value = this._bsValue;
shouldSetConfig = true;
}

if (changes.isDisabled) {
this._datepickerRef.instance.isDisabled = this.isDisabled;
this.setConfig();
shouldSetConfig = true;
}

if (changes.dateCustomClasses) {
this._datepickerRef.instance.dateCustomClasses = this.dateCustomClasses;
this.setConfig();
shouldSetConfig = true;
}

if (changes.dateTooltipTexts) {
this._datepickerRef.instance.dateTooltipTexts = this.dateTooltipTexts;
shouldSetConfig = true;
}

if (shouldSetConfig) {
this.setConfig();
}
}

updateSubscriptions(): void {
this._subs?.unsubscribe();
this._subs = new Subscription();

// if date changes from external source (model -> view)
this._subs.add(
this.bsValueChange.subscribe((value: Date) => {
if (this._datepickerRef) {
this._datepickerRef.instance.value = value;
}
})
);

// if date changes from picker (view -> model)
if (this._datepickerRef) {
this._subs.add(
this._datepickerRef.instance.valueChange.subscribe((value: Date) => {
this.bsValue = value;
})
);
}
}

/**
* Set config for datepicker
*/
Expand All @@ -196,6 +209,8 @@ export class BsDatepickerInlineDirective implements OnInit, OnDestroy, OnChanges
.attach(BsDatepickerInlineContainerComponent)
.to(this._elementRef)
.show();

this.updateSubscriptions();
}

ngOnDestroy() {
Expand Down
70 changes: 42 additions & 28 deletions src/datepicker/bs-daterangepicker-inline.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class BsDaterangepickerInlineDirective implements OnInit, OnDestroy, OnCh
*/
@Output() bsValueChange: EventEmitter<Date[]> = new EventEmitter();

protected _subs: Subscription[] = [];
protected _subs?: Subscription;

private readonly _datepicker: ComponentLoader<BsDaterangepickerInlineContainerComponent>;
private _datepickerRef?: ComponentRef<BsDaterangepickerInlineContainerComponent>;
Expand All @@ -92,43 +92,24 @@ export class BsDaterangepickerInlineDirective implements OnInit, OnDestroy, OnCh

ngOnInit(): void {
this.setConfig();

// if date changes from external source (model -> view)
this._subs.push(
this.bsValueChange.subscribe((value: Date[]) => {
if (this._datepickerRef) {
this._datepickerRef.instance.value = value;
}
})
);

// if date changes from picker (view -> model)
if (this._datepickerRef) {
this._subs.push(
this._datepickerRef.instance.valueChange
.pipe(
filter((range: Date[]) => range && range[0] && !!range[1])
)
.subscribe((value: Date[]) => {
this.bsValue = value;
})
);
}
this.updateSubscriptions();
}

ngOnChanges(changes: SimpleChanges): void {
if (!this._datepickerRef || !this._datepickerRef.instance) {
return;
}

let shouldSetConfig = false;

if (changes.minDate) {
this._datepickerRef.instance.minDate = this.minDate;
this.setConfig();
shouldSetConfig = true;
}

if (changes.maxDate) {
this._datepickerRef.instance.maxDate = this.maxDate;
this.setConfig();
shouldSetConfig = true;
}

if (changes.datesEnabled) {
Expand All @@ -137,25 +118,56 @@ export class BsDaterangepickerInlineDirective implements OnInit, OnDestroy, OnCh

if (changes.datesDisabled) {
this._datepickerRef.instance.datesDisabled = this.datesDisabled;
this.setConfig();
shouldSetConfig = true;
}

if (changes.daysDisabled) {
this._datepickerRef.instance.daysDisabled = this.daysDisabled;
this.setConfig();
shouldSetConfig = true;
}

if (changes.isDisabled) {
this._datepickerRef.instance.isDisabled = this.isDisabled;
this.setConfig();
shouldSetConfig = true;
}

if (changes.dateCustomClasses) {
this._datepickerRef.instance.dateCustomClasses = this.dateCustomClasses;
shouldSetConfig = true;
}

if (shouldSetConfig) {
this.setConfig();
}
}

updateSubscriptions(): void {
this._subs?.unsubscribe();
this._subs = new Subscription();

// if date changes from external source (model -> view)
this._subs.add(
this.bsValueChange.subscribe((value: Date[]) => {
if (this._datepickerRef) {
this._datepickerRef.instance.value = value;
}
})
);

// if date changes from picker (view -> model)
if (this._datepickerRef) {
this._subs.add(
this._datepickerRef.instance.valueChange
.pipe(
filter((range: Date[]) => range && range[0] && !!range[1])
)
.subscribe((value: Date[]) => {
this.bsValue = value;
})
);
}
}

/**
* Set config for datepicker
*/
Expand All @@ -182,6 +194,8 @@ export class BsDaterangepickerInlineDirective implements OnInit, OnDestroy, OnCh
.attach(BsDaterangepickerInlineContainerComponent)
.to(this._elementRef)
.show();

this.updateSubscriptions();
}

ngOnDestroy() {
Expand Down