Skip to content

Commit d9c8b68

Browse files
authored
fix!: revalidate number fields after bad input is removed (#5206)
1 parent bdef16e commit d9c8b68

3 files changed

Lines changed: 33 additions & 18 deletions

File tree

‎packages/integer-field/test/validation.test.js‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,28 @@ describe('validation', () => {
108108
expect(integerField.invalid).to.be.false;
109109
});
110110

111-
it('should be invalid when trying to commit a not valid number', async () => {
111+
it('should be invalid when trying to commit an invalid number', async () => {
112112
await sendKeys({ type: '1--' });
113113
input.blur();
114114
expect(integerField.invalid).to.be.true;
115115
});
116116

117-
it('should set an empty value when trying to commit a not valid number', async () => {
117+
it('should set an empty value when trying to commit an invalid number', async () => {
118118
integerField.value = '1';
119119
await sendKeys({ type: '1--' });
120120
await sendKeys({ type: 'Enter' });
121121
expect(integerField.value).to.equal('');
122122
});
123+
124+
it('should be valid after removing an invalid number', async () => {
125+
await sendKeys({ type: '1--' });
126+
input.blur();
127+
input.focus();
128+
await sendKeys({ press: 'Backspace' });
129+
await sendKeys({ press: 'Backspace' });
130+
await sendKeys({ press: 'Backspace' });
131+
input.blur();
132+
expect(integerField.invalid).to.be.false;
133+
});
123134
});
124135
});

‎packages/number-field/src/vaadin-number-field.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,17 +241,19 @@ export class NumberField extends InputFieldMixin(ThemableMixin(ElementMixin(Poly
241241
}
242242

243243
/**
244-
* Override a method from `InputConstraintsMixin`
245-
* to additionally check for bad user input.
244+
* Override the method from `InputConstraintsMixin`
245+
* to enforce HTML constraint validation even if
246+
* the user didn't add any constraints explicitly:
247+
* the field has to be regardless checked for bad input.
246248
*
247249
* @override
248250
*/
249251
checkValidity() {
250-
if (this.inputElement && this.inputElement.validity.badInput) {
251-
return false;
252+
if (this.inputElement) {
253+
return this.inputElement.checkValidity();
252254
}
253255

254-
return super.checkValidity();
256+
return !this.invalid;
255257
}
256258

257259
/** @private */

‎packages/number-field/test/validation.test.js‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ describe('validation', () => {
5353
expect(field.checkValidity()).to.equal(input.checkValidity());
5454
});
5555

56-
it('should not validate when explicitly set to invalid', () => {
57-
field.invalid = true;
58-
59-
expect(field.value).to.be.empty;
60-
expect(field.validate()).to.be.false;
61-
62-
expect(field.invalid).to.be.true;
63-
});
64-
6556
it('should allow setting decimals', () => {
6657
field.value = 7.6;
6758
expect(field.value).to.be.equal('7.6');
@@ -151,18 +142,29 @@ describe('validation', () => {
151142
expect(field.invalid).to.be.false;
152143
});
153144

154-
it('should be invalid when trying to commit a not valid number', async () => {
145+
it('should be invalid when trying to commit an invalid number', async () => {
155146
await sendKeys({ type: '1--' });
156147
input.blur();
157148
expect(field.invalid).to.be.true;
158149
});
159150

160-
it('should set an empty value when trying to commit a not valid number', async () => {
151+
it('should set an empty value when trying to commit an invalid number', async () => {
161152
field.value = '1';
162153
await sendKeys({ type: '1--' });
163154
await sendKeys({ type: 'Enter' });
164155
expect(field.value).to.equal('');
165156
});
157+
158+
it('should be valid after removing an invalid number', async () => {
159+
await sendKeys({ type: '1--' });
160+
input.blur();
161+
input.focus();
162+
await sendKeys({ press: 'Backspace' });
163+
await sendKeys({ press: 'Backspace' });
164+
await sendKeys({ press: 'Backspace' });
165+
input.blur();
166+
expect(field.invalid).to.be.false;
167+
});
166168
});
167169

168170
describe('initial', () => {

0 commit comments

Comments
 (0)