Merge fa417c0 into 471a367

vaadin · Jan 21, 2019 · d0c3226 · d0c3226
2 parents 471a367 + fa417c0
commit d0c3226
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/vaadin-number-field.html b/src/vaadin-number-field.html
@@ -209,6 +209,12 @@
         }
 
         __onInputChange() {
+          if (this.min && this.value < this.min) {
+            this.value = this.min;
+          } else if (this.max && this.value > this.max) {
+            this.value = this.max;
+          }
+
           this.checkValidity() && this.__adjustDecimals();
         }
 

diff --git a/test/number-field.html b/test/number-field.html
@@ -246,6 +246,20 @@
           numberField.value = '5';
           expect(numberField.validate(), 'value should not be greater than max').to.be.false;
         });
+
+        it('should prevent setting value over max', () => {
+          numberField.max = 2;
+          numberField.value = 5;
+          numberField.focusElement.dispatchEvent(new Event('change'));
+          expect(numberField.value).to.be.equal('2');
+        });
+
+        it('should prevent setting value under min', () => {
+          numberField.min = 2;
+          numberField.value = 1;
+          numberField.focusElement.dispatchEvent(new Event('change'));
+          expect(numberField.value).to.be.equal('2');
+        });
       });
 
     });