Skip to content

Commit e3440f7

Browse files
committed
fix(date-picker): emit proper event args on open/close events
1 parent 8433d02 commit e3440f7

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import { fadeIn, fadeOut } from '../animations/fade';
3232
import { PickerBaseDirective } from '../date-common/picker-base.directive';
3333
import { DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
3434
import { DatePart, DatePartDeltas, IgxDateTimeEditorDirective } from '../directives/date-time-editor/public_api';
35-
import { DeprecateProperty } from '../core/deprecateDecorators';
3635
import { DateTimeUtil } from '../date-common/util/date-time.util';
3736
import { PickerHeaderOrientation as PickerHeaderOrientation } from '../date-common/types';
3837
import { IDatePickerValidationFailedEventArgs } from './date-picker.common';
@@ -843,9 +842,10 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
843842
}
844843

845844
private subscribeToOverlayEvents() {
846-
this._overlayService.onOpening.pipe(...this._overlaySubFilter).subscribe((eventArgs) => {
847-
const args = eventArgs as IBaseCancelableBrowserEventArgs;
845+
this._overlayService.onOpening.pipe(...this._overlaySubFilter).subscribe((eventArgs: OverlayCancelableEventArgs) => {
846+
const args: IBaseCancelableBrowserEventArgs = { owner: this, event: eventArgs.event, cancel: eventArgs.cancel };
848847
this.opening.emit(args);
848+
eventArgs.cancel = args.cancel;
849849
if (args.cancel) {
850850
this._overlayService.detach(this._overlayId);
851851
return;
@@ -855,8 +855,9 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
855855
this._collapsed = false;
856856
});
857857

858-
this._overlayService.onOpened.pipe(...this._overlaySubFilter).subscribe((eventArgs) => {
859-
this.opened.emit(eventArgs as IBaseEventArgs);
858+
this._overlayService.onOpened.pipe(...this._overlaySubFilter).subscribe((_eventArgs) => {
859+
const args: IBaseEventArgs = { owner: this };
860+
this.opened.emit(args);
860861
if (this._calendar?.daysView?.selectedDates) {
861862
this._calendar?.daysView?.focusActiveDate();
862863
return;
@@ -868,9 +869,10 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
868869
}
869870
});
870871

871-
this._overlayService.onClosing.pipe(...this._overlaySubFilter).subscribe((eventArgs) => {
872-
const args = eventArgs as IBaseCancelableBrowserEventArgs;
872+
this._overlayService.onClosing.pipe(...this._overlaySubFilter).subscribe((eventArgs: OverlayCancelableEventArgs) => {
873+
const args: IBaseCancelableBrowserEventArgs = { owner: this, event: eventArgs.event, cancel: eventArgs.cancel };
873874
this.closing.emit(args);
875+
eventArgs.cancel = args.cancel;
874876
if (args.cancel) {
875877
return;
876878
}
@@ -880,8 +882,9 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
880882
}
881883
});
882884

883-
this._overlayService.onClosed.pipe(...this._overlaySubFilter).subscribe((event) => {
884-
this.closed.emit(event as IBaseEventArgs);
885+
this._overlayService.onClosed.pipe(...this._overlaySubFilter).subscribe((_event) => {
886+
const args: IBaseEventArgs = { owner: this };
887+
this.closed.emit(args);
885888
this._overlayService.detach(this._overlayId);
886889
this._collapsed = true;
887890
this._overlayId = null;

0 commit comments

Comments
 (0)