@linzjs/step-ag-grid 6.1.0 → 7.0.0

package/src/utils/textValidator.ts

@@ -1,22 +1,25 @@
 import { GridBaseRow } from "../components/Grid";
+import { stringByteLengthIsInvalid } from "./util";
 
 export interface TextInputValidatorProps<RowType extends GridBaseRow> {
   required?: boolean;
   maxLength?: number;
   maxBytes?: number;
-  invalid?: (value: string, data: RowType) => string | null;
+  invalid?: (value: string, data: RowType, context: any) => JSX.Element | string | null;
 }
 
 export const TextInputValidator = <RowType extends GridBaseRow>(
   props: TextInputValidatorProps<RowType>,
   value: string | null,
   data: RowType,
+  context: any,
 ) => {
   if (value == null) return null;
 
   // This can happen because subcomponent is invoked without type safety
   if (typeof value !== "string") {
     console.error("Value is not a string", value);
+    return null;
   }
   if (props.required && value.length === 0) {
     return `Some text is required`;
@@ -24,11 +27,11 @@ export const TextInputValidator = <RowType extends GridBaseRow>(
   if (props.maxLength && value.length > props.maxLength) {
     return `Text must be no longer than ${props.maxLength} characters`;
   }
-  if (props.maxBytes && new TextEncoder().encode(value).length > props.maxBytes) {
+  if (props.maxBytes && stringByteLengthIsInvalid(value, props.maxBytes)) {
     return `Text must be no longer than ${props.maxLength} bytes`;
   }
   if (props.invalid) {
-    return props.invalid(value, data);
+    return props.invalid(value, data, context);
   }
   return null;
 };

package/src/utils/util.ts

@@ -1,8 +1,6 @@
-import { isEmpty as _isEmpty } from "lodash-es";
+import { isEmpty, negate } from "lodash-es";
 
-// Typed version of lodash !isEmpty
-export const isNotEmpty = (obj: Set<any> | Map<any, any> | Record<any, any> | any[] | undefined): boolean =>
-  !_isEmpty(obj);
+export const isNotEmpty = negate(isEmpty);
 
 export const wait = (timeoutMs: number) =>
   new Promise<(string | null)[]>((resolve) => {
@@ -15,13 +13,14 @@ export const isFloat = (value: string) => {
 };
 
 export const hasParentClass = function (className: string, child: Node) {
-  let node: Node | null = child;
-  while (node) {
+  for (let node: Node | null = child; node; node = node.parentNode) {
     // When nodes are in portals they aren't type node anymore hence treating it as any here
     if ((node as any).classList && (node as any).classList.contains(className)) {
       return true;
     }
-    node = node.parentNode;
   }
   return false;
 };
+
+export const stringByteLengthIsInvalid = (str: string, maxBytes: number) =>
+  new TextEncoder().encode(str).length > maxBytes;