Skip to content

Commit 1e48afa

Browse files
javier-godoypaodb
authored andcommitted
refactor: isolate vaadin 24 code in ExtendedDatePicker
1 parent 9396e4c commit 1e48afa

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

src/main/resources/META-INF/frontend/fc-date-picker/fc-date-picker.js

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,31 +52,32 @@ export class FcDatePicker extends DatePicker {
5252

5353
this._styles={};
5454

55-
this._overlayElement.renderer = e => {
56-
this._boundOverlayRenderer.call(this,e);
57-
58-
if (!this._overlayContent._monthScroller.__fcWrapped) {
59-
const createElement = this._overlayContent._monthScroller._createElement;
60-
this._overlayContent._monthScroller.__fcWrapped = true;
61-
this._overlayContent._monthScroller._createElement = () => {
62-
var calendar = createElement();
63-
calendar.addEventListener('dom-change',ev=>{
64-
if (ev.composedPath()[0].as=='week') {
65-
setTimeout(()=> this._updateMonthStyles(calendar));
66-
}
67-
});
68-
return calendar;
55+
if (this._boundOverlayRenderer) {
56+
this._overlayElement.renderer = e => {
57+
this._boundOverlayRenderer.call(this,e);
58+
59+
if (!this._overlayContent._monthScroller.__fcWrapped) {
60+
const createElement = this._overlayContent._monthScroller._createElement;
61+
this._overlayContent._monthScroller.__fcWrapped = true;
62+
this._overlayContent._monthScroller._createElement = () => {
63+
var calendar = createElement();
64+
calendar.addEventListener('dom-change',ev=>{
65+
if (ev.composedPath()[0].as=='week') {
66+
setTimeout(()=> this._updateMonthStyles(calendar));
67+
}
68+
});
69+
return calendar;
70+
}
6971
}
70-
}
71-
};
72-
73-
this.inputElement.addEventListener('focus', ()=>this.__focused=true);
72+
};
73+
}
7474
}
7575

7676
refreshAll() {
7777
this._styles = {};
78-
if (this._overlayContent) {
79-
this._overlayContent._monthScroller.querySelectorAll("vaadin-month-calendar").forEach(calendar=>this._updateMonthStyles(calendar));
78+
const overlayContent = this._overlayContent;
79+
if (overlayContent) {
80+
overlayContent._monthScroller.querySelectorAll("vaadin-month-calendar").forEach(calendar=>this._updateMonthStyles(calendar));
8081
}
8182
}
8283

0 commit comments

Comments
 (0)