Skip to content

Commit 6cb2a71

Browse files
authored
fix(ui5-daterange-picker): fix js error when removed from the DOM (#2180)
1 parent 5193cbe commit 6cb2a71

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

packages/main/src/DatePickerPopover.hbs

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
no-stretch
1111
?_hide-header={{_shouldHideHeader}}
1212
@keydown="{{_onkeydown}}"
13-
@ui5-after-close="{{_respPopoverConfig.afterClose}}"
13+
@ui5-before-open="{{_respPopoverConfig.beforeOpen}}"
1414
@ui5-after-open="{{_respPopoverConfig.afterOpen}}"
15+
@ui5-before-close="{{_respPopoverConfig.beforeClose}}"
16+
@ui5-after-close="{{_respPopoverConfig.afterClose}}"
1517
>
1618
{{#if showHeader}}
1719
{{> header}}

packages/main/src/DateRangePicker.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ class DateRangePicker extends DatePicker {
9595
this._initialRendering = true;
9696
this._oneTimeStampSelected = false; // Used to determine whether the first & last date is the same
9797
this._dayPickerMouseoverHandler = this._itemMouseoverHandler.bind(this);
98+
this._respPopoverConfig.beforeOpen = this.handleBeforeOpen;
99+
this._respPopoverConfig.beforeClose = this.handleBeforeClose;
98100
}
99101

100102
async onAfterRendering() {
@@ -103,13 +105,13 @@ class DateRangePicker extends DatePicker {
103105
this._initialRendering = false;
104106
}
105107

106-
async onEnterDOM() {
108+
async handleBeforeOpen() {
107109
const daypicker = await this.getDayPicker();
108110
daypicker.addEventListener("item-mouseover", this._dayPickerMouseoverHandler);
109111
daypicker.addEventListener("daypickerrendered", this._keyboardNavigationHandler);
110112
}
111113

112-
async onExitDOM() {
114+
async handleBeforeClose() {
113115
const daypicker = await this.getDayPicker();
114116
daypicker.removeEventListener("item-mouseover", this._dayPickerMouseoverHandler);
115117
daypicker.removeEventListener("daypickerrendered", this._keyboardNavigationHandler);

0 commit comments

Comments
 (0)