Skip to content

Commit 1eab835

Browse files
authored
fix: initialize date-picker-light overlay (#3922)
1 parent 5f34b00 commit 1eab835

4 files changed

Lines changed: 24 additions & 3 deletions

File tree

‎packages/date-picker/src/vaadin-date-picker-light.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ class DatePickerLight extends ThemableMixin(DatePickerMixin(PolymerElement)) {
125125
};
126126
}
127127

128+
/** @protected */
129+
ready() {
130+
super.ready();
131+
132+
this._initOverlay();
133+
}
134+
128135
/** @protected */
129136
connectedCallback() {
130137
super.connectedCallback();

‎packages/date-picker/src/vaadin-date-picker-mixin.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ export const DatePickerMixin = (subclass) =>
473473
}
474474
}
475475

476-
/** @private */
476+
/** @protected */
477477
_initOverlay() {
478478
this.$.overlay.removeAttribute('disable-upgrade');
479479
this._overlayInitialized = true;
@@ -509,8 +509,6 @@ export const DatePickerMixin = (subclass) =>
509509
this._setFocused(true);
510510
});
511511

512-
this.$.overlay.addEventListener('vaadin-overlay-close', this._onVaadinOverlayClose.bind(this));
513-
514512
this.addEventListener('mousedown', () => this.__bringToFront());
515513
this.addEventListener('touchstart', () => this.__bringToFront());
516514
}

‎packages/date-picker/src/vaadin-date-picker.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,13 @@ class DatePicker extends DatePickerMixin(InputControlMixin(ThemableMixin(Element
212212
toggleButton.addEventListener('mousedown', (e) => e.preventDefault());
213213
}
214214

215+
/** @protected */
216+
_initOverlay() {
217+
super._initOverlay();
218+
219+
this.$.overlay.addEventListener('vaadin-overlay-close', this._onVaadinOverlayClose.bind(this));
220+
}
221+
215222
/** @private */
216223
_onVaadinOverlayClose(e) {
217224
if (this._openedWithFocusRing && this.hasAttribute('focused')) {

‎packages/date-picker/test/custom-input.test.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { expect } from '@esm-bundle/chai';
22
import { fire, fixtureSync, nextRender, tap } from '@vaadin/testing-helpers';
3+
import sinon from 'sinon';
34
import './not-animated-styles.js';
45
import '../vaadin-date-picker-light.js';
56
import { getOverlayContent, open, waitForScrollToFinish } from './common.js';
@@ -35,6 +36,14 @@ describe('custom input', () => {
3536
expect(overlay.opened).not.to.be.true;
3637
});
3738

39+
it('should close on overlay date tap', async () => {
40+
datepicker.open();
41+
const spy = sinon.spy(datepicker, 'close');
42+
const evt = new CustomEvent('date-tap', { detail: { date: new Date() }, bubbles: true, composed: true });
43+
getOverlayContent(datepicker).dispatchEvent(evt);
44+
expect(spy.called).to.be.true;
45+
});
46+
3847
it('should show week numbers', () => {
3948
datepicker.showWeekNumbers = true;
4049
const overlayContent = getOverlayContent(datepicker);

0 commit comments

Comments
 (0)