Skip to content

Commit bfdc73b

Browse files
authored
fix: ensure validation is triggered before change event (#6242)
1 parent e3c2ff0 commit bfdc73b

2 files changed

Lines changed: 24 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@ class DateTimePicker extends FieldMixin(DisabledMixin(FocusMixin(ThemableMixin(E
510510
event.stopPropagation();
511511

512512
if (this.__dispatchChangeForValue === this.value) {
513-
this.__dispatchChange();
514513
this.validate();
514+
this.__dispatchChange();
515515
}
516516
this.__dispatchChangeForValue = undefined;
517517
}

‎packages/date-time-picker/test/validation.test.js‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ const fixtures = {
2525

2626
['default', 'slotted'].forEach((set) => {
2727
describe(`Validation (${set})`, () => {
28-
let dateTimePicker, validateSpy, datePicker, timePicker;
28+
let dateTimePicker, validateSpy, changeSpy, datePicker, timePicker;
2929

3030
beforeEach(() => {
3131
dateTimePicker = fixtureSync(fixtures[set]);
3232
validateSpy = sinon.spy(dateTimePicker, 'validate');
33+
changeSpy = sinon.spy();
34+
dateTimePicker.addEventListener('change', changeSpy);
3335
datePicker = dateTimePicker.querySelector('[slot=date-picker]');
3436
timePicker = dateTimePicker.querySelector('[slot=time-picker]');
3537
});
@@ -69,6 +71,26 @@ const fixtures = {
6971
expect(validateSpy.calledOnce).to.be.true;
7072
});
7173

74+
it('should validate before change event on date-picker change', async () => {
75+
timePicker.value = '12:00';
76+
datePicker.focus();
77+
await sendKeys({ type: '1/1/2023' });
78+
await sendKeys({ press: 'Enter' });
79+
expect(changeSpy.calledOnce).to.be.true;
80+
expect(validateSpy.calledOnce).to.be.true;
81+
expect(validateSpy.calledBefore(changeSpy)).to.be.true;
82+
});
83+
84+
it('should validate before change event on time-picker change', async () => {
85+
datePicker.value = '2023-01-01';
86+
timePicker.focus();
87+
await sendKeys({ type: '12:00' });
88+
await sendKeys({ press: 'Enter' });
89+
expect(changeSpy.calledOnce).to.be.true;
90+
expect(validateSpy.calledOnce).to.be.true;
91+
expect(validateSpy.calledBefore(changeSpy)).to.be.true;
92+
});
93+
7294
it('should not validate when moving focus between pickers', async () => {
7395
datePicker.focus();
7496
// Move focus to time-picker

0 commit comments

Comments
 (0)