@linzjs/step-ag-grid 7.7.0 → 7.8.1

package/package.json

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

package/src/stories/grid/GridPopoutBearing.stories.tsx

@@ -88,6 +88,7 @@ const GridReadOnlyTemplate: ComponentStory<typeof Grid> = (props: GridProps) =>
     { id: 1001, bearing: "0E-12", bearingCorrection: 240 },
     { id: 1002, bearing: null, bearingCorrection: 355.1 },
     { id: 1003, bearing: null, bearingCorrection: 0 },
+    { id: 1004, bearing: 5.0, bearingCorrection: 50.0 },
   ] as ITestRow[]);
 
   return (

package/src/utils/bearing.ts

@@ -16,7 +16,7 @@ export const bearingCorrectionValueFormatter = (params: ValueFormatterParams): s
   if (typeof value === "string") {
     return convertDDToDMS(bearingNumberParser(value), true, true);
   }
-  return convertDDToDMS(value, true, true);
+  return convertDDToDMS(value, true, false);
 };
 
 export const bearingNumberParser = (value: string): number | null => {

package/src/utils/textValidator.test.ts

@@ -41,16 +41,28 @@ describe("TextInputValidator", () => {
         ],
       },
       {
-        numberFormat: { precision: 2 },
+        numberFormat: { precision: 3 },
         tests: [
           ["x", "Must be a valid number"],
           ["", null],
           ["1.22", null],
+          ["0.122", null],
+          ["1.123", "Must have no more than 3 digits precision"],
+          ["0.1234", "Must have no more than 3 digits precision"],
+        ],
+      },
+      {
+        numberFormat: { scale: 2 },
+        tests: [
+          ["x", "Must be a valid number"],
+          ["", null],
+          ["1.22", null],
+          ["0.122", "Must have no more than 2 decimal places"],
           ["1.123", "Must have no more than 2 decimal places"],
         ],
       },
       {
-        numberFormat: { precision: 0 },
+        numberFormat: { scale: 0 },
         tests: [
           ["1", null],
           ["1.1", "Must be a whole number"],

package/src/utils/textValidator.ts

@@ -8,6 +8,7 @@ export interface TextInputValidatorProps<RowType extends GridBaseRow> {
   invalid?: (value: string, data: RowType, context: any) => JSX.Element | string | null;
   numberFormat?: {
     precision?: number;
+    scale?: number;
     gtMin?: number;
     geMin?: number;
     ltMax?: number;
@@ -41,22 +42,31 @@ export const TextInputValidator = <RowType extends GridBaseRow>(
     if (value != "" && !isFloat(value)) {
       return `Must be a valid number`;
     }
-    const number = parseFloat(value);
-    if (nf.gtMin != null && number <= nf.gtMin) {
-      return `Must be greater than ${nf.gtMin}`;
-    }
-    if (nf.geMin != null && number < nf.geMin) {
-      return `Must not be less than ${nf.geMin}`;
-    }
-    if (nf.ltMax != null && number >= nf.ltMax) {
-      return `Must be less than ${nf.ltMax}`;
-    }
-    if (nf.leMax != null && number > nf.leMax) {
-      return `Must not be greater than ${nf.leMax}`;
-    }
-    if (nf.precision != null && value != "") {
-      if (parseFloat(number.toPrecision(nf.precision + 1)) != number) {
-        return nf.precision == 0 ? `Must be a whole number` : `Must have no more than ${nf.precision} decimal places`;
+    if (value != "") {
+      const number = parseFloat(value);
+      if (nf.gtMin != null && number <= nf.gtMin) {
+        return `Must be greater than ${nf.gtMin}`;
+      }
+      if (nf.geMin != null && number < nf.geMin) {
+        return `Must not be less than ${nf.geMin}`;
+      }
+      if (nf.ltMax != null && number >= nf.ltMax) {
+        return `Must be less than ${nf.ltMax}`;
+      }
+      if (nf.leMax != null && number > nf.leMax) {
+        return `Must not be greater than ${nf.leMax}`;
+      }
+
+      if (nf.precision != null && value != "") {
+        if (parseFloat(number.toPrecision(nf.precision)) != number) {
+          return `Must have no more than ${nf.precision} digits precision`;
+        }
+      }
+
+      if (nf.scale != null && value != "") {
+        if (parseFloat(number.toFixed(nf.scale)) != number) {
+          return nf.scale == 0 ? `Must be a whole number` : `Must have no more than ${nf.scale} decimal places`;
+        }
       }
     }
   }