@linzjs/step-ag-grid 14.6.0 → 14.7.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "14.6.0",
+  "version": "14.7.0",
   "keywords": [
     "aggrid",
     "ag-grid",

package/src/utils/textValidator.test.ts

@@ -68,6 +68,13 @@ describe("TextInputValidator", () => {
           ["1.1", "Must be a whole number"],
         ],
       },
+      {
+        numberFormat: { notZero: true },
+        tests: [
+          ["1", null],
+          ["0", "Must not be 0"],
+        ],
+      },
       {
         required: true,
         tests: [

package/src/utils/textValidator.ts

@@ -13,6 +13,7 @@ export interface TextInputValidatorProps<RowType extends GridBaseRow> {
     geMin?: number;
     ltMax?: number;
     leMax?: number;
+    notZero?: boolean;
   };
 }
 
@@ -44,17 +45,20 @@ export const TextInputValidator = <RowType extends GridBaseRow>(
     }
     if (value != "") {
       const number = parseFloat(value);
+      if (nf.notZero && number === 0) {
+        return `Must not be 0`;
+      }
       if (nf.gtMin != null && number <= nf.gtMin) {
-        return `Must be greater than ${nf.gtMin}`;
+        return `Must be greater than ${nf.gtMin.toLocaleString()}`;
       }
       if (nf.geMin != null && number < nf.geMin) {
-        return `Must not be less than ${nf.geMin}`;
+        return `Must not be less than ${nf.geMin.toLocaleString()}`;
       }
       if (nf.ltMax != null && number >= nf.ltMax) {
-        return `Must be less than ${nf.ltMax}`;
+        return `Must be less than ${nf.ltMax.toLocaleString()}`;
       }
       if (nf.leMax != null && number > nf.leMax) {
-        return `Must not be greater than ${nf.leMax}`;
+        return `Must not be greater than ${nf.leMax.toLocaleString()}`;
       }
 
       if (nf.precision != null && value != "") {

package/src/utils/util.test.ts

@@ -1,6 +1,17 @@
-import { sanitiseFileName } from "./util";
+import { isFloat, sanitiseFileName } from "./util";
 
 describe("sanitiseFileName", () => {
+  test("isFloat", () => {
+    expect(isFloat("")).toBe(false);
+    expect(isFloat("x")).toBe(false);
+    expect(isFloat("1e10")).toBe(false);
+    expect(isFloat("1x")).toBe(false);
+    expect(isFloat("1.x")).toBe(false);
+    expect(isFloat("x.1")).toBe(false);
+    expect(isFloat("1")).toBe(true);
+    expect(isFloat("1.")).toBe(true);
+    expect(isFloat(".1")).toBe(true);
+  });
   test("sanitiseFileName", () => {
     expect(sanitiseFileName(" LT 1235/543 &%//*$ ")).toBe("LT_1235-543_&%-$");
     expect(sanitiseFileName(" @filename here!!! ")).toBe("@filename_here!!!");

package/src/utils/util.ts

@@ -8,9 +8,18 @@ export const wait = (timeoutMs: number) =>
     setTimeout(resolve, timeoutMs);
   });
 
+// This regexp only works if you parseFloat first, it won't validate a float on its own
+// It prevents scientific 1e10, or trailing decimal 1.2.3, or trailing garbage 1.2xyz
+const isFloatRegExp = /^-?\d*\.?\d*$/;
 export const isFloat = (value: string) => {
-  const regexp = /^-?\d*(\.\d+)?$/;
-  return regexp.test(value);
+  try {
+    // Just checking it's not scientific notation or "NaN" here.
+    // Also parse float will parse up to the first invalid character,
+    // so we need to check there's no remaining invalids e.g. "1.2xyz" would parse as 1.2
+    return !Number.isNaN(parseFloat(value)) && isFloatRegExp.test(value);
+  } catch {
+    return false;
+  }
 };
 
 export const findParentWithClass = function (className: string, child: Node): HTMLElement | null {