Accept NaN as valid

vaadin · Dec 10, 2024 · fd0454d · fd0454d
1 parent dfc0bca
commit fd0454d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/packages/ts/lit-form/src/Validators.ts b/packages/ts/lit-form/src/Validators.ts
@@ -268,7 +268,8 @@ export class Negative<T> extends AbstractValidator<T> {
   }
 
   override validate(value: T): boolean {
-    return toFloat(String(value)) < 0;
+    const fv = toFloat(String(value));
+    return isNaN(fv) || fv < 0;
   }
 
   readonly name = 'Negative';
@@ -280,7 +281,7 @@ export class NegativeOrZero<T> extends AbstractValidator<T> {
   }
 
   override validate(value: T): boolean {
-    return toFloat(String(value)) <= 0;
+    return (toFloat(String(value)) || 0) <= 0;
   }
 
   readonly name = 'NegativeOrZero';
@@ -292,7 +293,8 @@ export class Positive<T> extends AbstractValidator<T> {
   }
 
   override validate(value: T): boolean {
-    return toFloat(String(value)) > 0;
+    const fv = toFloat(String(value));
+    return isNaN(fv) || fv > 0;
   }
 
   readonly name = 'Positive';
@@ -304,7 +306,7 @@ export class PositiveOrZero<T> extends AbstractValidator<T> {
   }
 
   override validate(value: T): boolean {
-    return toFloat(String(value)) >= 0;
+    return (toFloat(String(value)) || 0) >= 0;
   }
 
   readonly name = 'PositiveOrZero';

diff --git a/packages/ts/lit-form/test/Validators.test.ts b/packages/ts/lit-form/test/Validators.test.ts
@@ -211,6 +211,9 @@ describe('@vaadin/hilla-lit-form', () => {
       assert.isTrue(validator.validate(-0.01));
       assert.isFalse(validator.validate(0));
       assert.isFalse(validator.validate(1));
+      assert.isTrue(validator.validate(undefined));
+      assert.isTrue(validator.validate(null));
+      assert.isTrue(validator.validate(''));
     });
 
     it('NegativeOrZero', () => {
@@ -221,6 +224,9 @@ describe('@vaadin/hilla-lit-form', () => {
       assert.isTrue(validator.validate(-0.01));
       assert.isTrue(validator.validate(0));
       assert.isFalse(validator.validate(1));
+      assert.isTrue(validator.validate(undefined));
+      assert.isTrue(validator.validate(null));
+      assert.isTrue(validator.validate(''));
     });
 
     it('Positive', () => {
@@ -231,6 +237,9 @@ describe('@vaadin/hilla-lit-form', () => {
       assert.isFalse(validator.validate(-0.01));
       assert.isFalse(validator.validate(0));
       assert.isTrue(validator.validate(0.01));
+      assert.isTrue(validator.validate(undefined));
+      assert.isTrue(validator.validate(null));
+      assert.isTrue(validator.validate(''));
     });
 
     it('PositiveOrZero', () => {
@@ -241,6 +250,9 @@ describe('@vaadin/hilla-lit-form', () => {
       assert.isFalse(validator.validate(-0.01));
       assert.isTrue(validator.validate(0));
       assert.isTrue(validator.validate(0.01));
+      assert.isTrue(validator.validate(undefined));
+      assert.isTrue(validator.validate(null));
+      assert.isTrue(validator.validate(''));
     });
 
     it('Size', () => {