@bsol-oss/react-datatable5 13.0.1-beta.26 → 13.0.1-beta.28

package/dist/index.mjs

@@ -21,7 +21,7 @@ import { IoReload } from 'react-icons/io5';
 import { useDebounce } from '@uidotdev/usehooks';
 import { BsExclamationCircleFill, BsClock } from 'react-icons/bs';
 import { HiColorSwatch } from 'react-icons/hi';
-import { flexRender, makeStateUpdater, functionalUpdate, useReactTable, getCoreRowModel, getFilteredRowModel, getSortedRowModel, getPaginationRowModel } from '@tanstack/react-table';
+import { flexRender, makeStateUpdater, functionalUpdate, useReactTable, getPaginationRowModel, getSortedRowModel, getFilteredRowModel, getCoreRowModel } from '@tanstack/react-table';
 import { GrAscend, GrDescend } from 'react-icons/gr';
 import axios from 'axios';
 import { useFormContext, FormProvider, useForm as useForm$1 } from 'react-hook-form';
@@ -30,9 +30,7 @@ import customParseFormat from 'dayjs/plugin/customParseFormat';
 import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
 import { TiDeleteOutline } from 'react-icons/ti';
-import Ajv from 'ajv';
-import addFormats from 'ajv-formats';
-import AjvErrors from 'ajv-errors';
+import { ajvResolver } from '@hookform/resolvers/ajv';
 import { rankItem } from '@tanstack/match-sorter-utils';
 
 const DataTableContext = createContext({
@@ -1133,7 +1131,7 @@ function getElementFromPointWithoutHoneypot(client) {
 var maxZIndex = 2147483647;
 
 function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var honeyPotSize = 2;
 var halfHoneyPotSize = honeyPotSize / 2;
 
@@ -2238,8 +2236,8 @@ function addAttribute(element, _ref) {
 }
 
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createForOfIteratorHelper$1(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$1(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper$1(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$1(r)) || e) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: true } : { done: false, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = true, u = false; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = true, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$1(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$1(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$1(r, a) : void 0; } }
 function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function copyReverse(array) {
@@ -2543,11 +2541,11 @@ function makeDropTarget(_ref) {
   };
 }
 
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: true } : { done: false, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = true, u = false; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = true, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function makeMonitor() {
   var registry = new Set();
   var dragging = null;
@@ -4169,20 +4167,13 @@ const useDataTableServer = (props) => {
 //@ts-expect-error TODO: find appropriate type
 const SchemaFormContext = createContext({
     schema: {},
-    requestUrl: '',
-    order: [],
-    ignore: [],
-    include: [],
     onSubmit: async () => { },
-    rowNumber: 0,
-    requestOptions: {},
     timezone: 'Asia/Hong_Kong',
     displayConfig: {
         showSubmitButton: true,
         showResetButton: true,
         showTitle: true,
     },
-    onFormSubmit: async () => { },
 });
 
 const useSchemaContext = () => {
@@ -4211,8 +4202,8 @@ const useFormLabel = (column, prefix = '', schema) => {
                 prefix,
                 schema: {
                     type: schema.type,
-                    errorMessages: schema.errorMessages
-                        ? Object.keys(schema.errorMessages)
+                    errorMessage: schema.errorMessage
+                        ? Object.keys(schema.errorMessage)
                         : undefined,
                 },
             });
@@ -4224,8 +4215,8 @@ const useFormLabel = (column, prefix = '', schema) => {
 
 const ArrayRenderer = ({ schema, column, prefix, }) => {
     const { gridRow, gridColumn = '1/span 12', required, items } = schema;
-    // @ts-expect-error TODO: find suitable types
-    const { type } = items;
+    const itemsSchema = Array.isArray(items) ? items[0] : items;
+    const { type } = itemsSchema ?? {};
     const colLabel = `${prefix}${column}`;
     const isRequired = required?.some((columnId) => columnId === column);
     const formI18n = useFormLabel(column, prefix, schema);
@@ -4237,8 +4228,10 @@ const ArrayRenderer = ({ schema, column, prefix, }) => {
                         _dark: 'colorPalette.800',
                     }, children: [jsx(Grid, { gridTemplateColumns: 'repeat(12, 1fr)', autoFlow: 'row', children: jsx(SchemaRenderer, { column: `${index}`,
                                 prefix: `${colLabel}.`,
-                                // @ts-expect-error find suitable types
-                                schema: { showLabel: false, ...(items ?? {}) } }) }), jsx(Flex, { justifyContent: 'end', children: jsx(Button$1, { variant: 'ghost', onClick: () => {
+                                schema: {
+                                    showLabel: false,
+                                    ...(Array.isArray(items) ? items[0] : items ?? {}),
+                                } }) }), jsx(Flex, { justifyContent: 'end', children: jsx(Button$1, { variant: 'ghost', onClick: () => {
                                     setValue(colLabel, fields.filter((_, curIndex) => {
                                         return curIndex !== index;
                                     }));
@@ -5321,16 +5314,13 @@ const FileDropzone = ({ children = undefined, gridProps = {}, onDrop = () => { }
             element: el,
             onDragEnter: () => setIsDraggedOver(true),
             onDragLeave: () => setIsDraggedOver(false),
-            //   canDrop: some(containsFiles, containsText),
             onDrop: ({ source }) => {
                 const files = getFiles({ source });
                 const text = getText({ source });
-                console.log(files, text, 'dfposa');
                 onDrop({ files, text });
             },
         });
     }, [onDrop]);
-    // const isDark = (location + location) % 2 === 1;
     function getColor(isDraggedOver) {
         if (isDraggedOver) {
             return {
@@ -5340,7 +5330,6 @@ const FileDropzone = ({ children = undefined, gridProps = {}, onDrop = () => { }
                 },
             };
         }
-        // return isDark ? "lightgrey" : "white";
         return {
             backgroundColor: undefined,
             _dark: {
@@ -6223,11 +6212,9 @@ const ObjectInput = ({ schema, column, prefix }) => {
                     base: 'colorPalette.200',
                     _dark: 'colorPalette.800',
                 }, gap: "4", padding: '4', gridTemplateColumns: 'repeat(12, 1fr)', autoFlow: 'row', children: Object.keys(properties ?? {}).map((key) => {
-                    return (
-                    // @ts-expect-error find suitable types
-                    jsx(ColumnRenderer, { column: `${key}`,
+                    return (jsx(ColumnRenderer, { column: `${key}`,
                         prefix: `${prefix}${column}.`,
-                        properties,
+                        properties: properties ?? {},
                         parentRequired: required }, `form-${colLabel}-${key}`));
                 }) })] }));
 };
@@ -7969,7 +7956,8 @@ const SchemaRenderer = ({ schema, prefix, column, }) => {
         }
         if (variant === 'enum-picker') {
             const { items, title } = colSchema;
-            const { enum: enumItems } = items;
+            const itemsSchema = Array.isArray(items) ? items[0] : items;
+            const { enum: enumItems } = itemsSchema ?? {};
             // Use renderDisplay from parent schema only
             const renderDisplay = colSchema.renderDisplay;
             const enumSchema = {
@@ -8006,15 +7994,15 @@ const ColumnRenderer = ({ column, properties, prefix, parentRequired, }) => {
 };
 
 const SubmitButton = () => {
-    const { setValidatedData, setIsError, onFormSubmit, formButtonLabels } = useSchemaContext();
+    const { onSubmit, formButtonLabels } = useSchemaContext();
     const methods = useFormContext();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const onValid = (data) => {
+    const onValid = async (data) => {
         // Validation is handled by react-hook-form
         // This function will only be called if validation passes
-        setValidatedData(data);
-        setIsError(false);
-        onFormSubmit(data);
+        if (onSubmit) {
+            await onSubmit(data);
+        }
     };
     return (jsx(Button$1, { onClick: () => {
             methods.handleSubmit(onValid)();
@@ -8022,33 +8010,21 @@ const SubmitButton = () => {
 };
 
 const FormBody = () => {
-    const { schema, order, ignore, include, isError, error, customErrorRenderer, displayConfig, formButtonLabels, } = useSchemaContext();
+    const { schema, displayConfig, formButtonLabels } = useSchemaContext();
     const { showSubmitButton, showResetButton } = displayConfig;
     const methods = useFormContext();
-    console.log(methods.formState.errors);
+    console.log('errors', methods.formState.errors);
     const { properties } = schema;
-    const renderColumns = ({ order, keys, ignore, include, }) => {
-        const included = include.length > 0 ? include : keys;
-        const not_exist = included.filter((columnA) => !order.some((columnB) => columnA === columnB));
-        const ordered = [...order, ...not_exist];
-        const ignored = ordered.filter((column) => !ignore.some((shouldIgnore) => column === shouldIgnore));
-        return ignored;
-    };
-    const ordered = renderColumns({
-        order,
-        keys: Object.keys(properties),
-        ignore,
-        include,
-    });
+    const ordered = Object.keys(properties);
     return (jsxs(Flex, { flexFlow: 'column', gap: "2", children: [jsx(Grid, { gap: "4", gridTemplateColumns: 'repeat(12, 1fr)', autoFlow: 'row', children: ordered.map((column) => {
-                    return (jsx(ColumnRenderer
-                    // @ts-expect-error find suitable types
-                    , { 
-                        // @ts-expect-error find suitable types
-                        properties: properties, prefix: ``, parentRequired: schema.required, column }, `form-input-${column}`));
+                    if (!properties) {
+                        console.error('properties is undefined when using FormBody', schema);
+                        return null;
+                    }
+                    return (jsx(ColumnRenderer, { properties: properties, prefix: ``, parentRequired: schema.required, column }, `form-input-${column}`));
                 }) }), jsxs(Flex, { justifyContent: 'end', gap: "2", children: [showResetButton && (jsx(Button$1, { onClick: () => {
                             methods.reset();
-                        }, variant: 'subtle', children: formButtonLabels?.reset ?? 'Reset' })), showSubmitButton && jsx(SubmitButton, {})] }), isError && customErrorRenderer && customErrorRenderer(error)] }));
+                        }, variant: 'subtle', children: formButtonLabels?.reset ?? 'Reset' })), showSubmitButton && jsx(SubmitButton, {})] })] }));
 };
 
 const FormTitle = () => {
@@ -8067,96 +8043,18 @@ const FormTitle = () => {
     return jsx(Heading, { children: schema.title ?? 'Form' });
 };
 
-const clearEmptyString = (object) => {
-    return Object.fromEntries(Object.entries(object).filter(([, value]) => value !== ""));
-};
-
-const FormRoot = ({ schema, idMap, setIdMap, form, children, order = [], ignore = [], include = [], onSubmit = undefined, rowNumber = undefined, requestOptions = {}, getUpdatedData = () => { }, customErrorRenderer, customSuccessRenderer, displayConfig = {
+const FormRoot = ({ schema, idMap, setIdMap, form, children, onSubmit = undefined, displayConfig = {
     showSubmitButton: true,
     showResetButton: true,
     showTitle: true,
 }, dateTimePickerLabels, idPickerLabels, enumPickerLabels, filePickerLabels, formButtonLabels, timePickerLabels, insideDialog = false, }) => {
-    const [isSuccess, setIsSuccess] = useState(false);
-    const [isError, setIsError] = useState(false);
-    const [isSubmiting, setIsSubmiting] = useState(false);
-    const [validatedData, setValidatedData] = useState();
-    const [error, setError] = useState();
-    const onBeforeSubmit = () => {
-        setIsSubmiting(true);
-    };
-    const onAfterSubmit = () => {
-        setIsSubmiting(false);
-    };
-    const onSubmitError = (error) => {
-        setIsError(true);
-        setError(error);
-    };
-    const onSubmitSuccess = () => {
-        setIsSuccess(true);
-    };
-    const defaultOnSubmit = async (promise) => {
-        try {
-            console.log('onBeforeSubmit');
-            onBeforeSubmit();
-            await promise;
-            console.log('onSubmitSuccess');
-            onSubmitSuccess();
-        }
-        catch (error) {
-            console.log('onSubmitError', error);
-            onSubmitError(error);
-        }
-        finally {
-            onAfterSubmit();
-        }
-    };
-    const defaultSubmitPromise = (data) => {
-        if (!requestOptions.url) {
-            throw new Error('requestOptions.url is required when onSubmit is not provided');
-        }
-        const options = {
-            method: 'POST',
-            data: clearEmptyString(data),
-            ...requestOptions,
-        };
-        return axios.request(options);
-    };
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const onFormSubmit = async (data) => {
-        // Validation is handled by react-hook-form
-        // This function will only be called if validation passes
-        if (onSubmit === undefined) {
-            await defaultOnSubmit(Promise.resolve(defaultSubmitPromise(data)));
-            return;
-        }
-        await defaultOnSubmit(Promise.resolve(onSubmit(data)));
-    };
     return (jsx(SchemaFormContext.Provider, { value: {
             schema,
-            order,
-            ignore,
-            include,
             // @ts-expect-error TODO: find appropriate types
             onSubmit,
-            rowNumber,
             idMap,
             setIdMap,
-            requestOptions,
-            isSuccess,
-            setIsSuccess,
-            isError,
-            setIsError,
-            isSubmiting,
-            setIsSubmiting,
-            validatedData,
-            setValidatedData,
-            error,
-            setError,
-            getUpdatedData,
-            customErrorRenderer,
-            customSuccessRenderer,
             displayConfig,
-            onFormSubmit,
             dateTimePickerLabels,
             idPickerLabels,
             enumPickerLabels,
@@ -8172,223 +8070,15 @@ const DefaultForm = ({ formConfig, }) => {
     return (jsx(FormRoot, { ...formConfig, children: jsxs(Grid, { gap: "2", children: [showTitle && jsx(FormTitle, {}), jsx(FormBody, {})] }) }));
 };
 
-const validateData = (data, schema) => {
-    const ajv = new Ajv({
-        strict: false,
-        allErrors: true,
-    });
-    addFormats(ajv);
-    AjvErrors(ajv); // Load ajv-errors plugin to process errorMessage format
-    const validate = ajv.compile(schema);
-    const validationResult = validate(data);
-    const errors = validate.errors;
-    return {
-        isValid: validationResult,
-        validate,
-        errors,
-    };
-};
-
-/**
- * Gets the schema node for a given field path
- */
-const getSchemaNodeForField = (schema, fieldPath) => {
-    if (!fieldPath || fieldPath === '') {
-        return schema;
-    }
-    const pathParts = fieldPath.split('.');
-    let currentSchema = schema;
-    for (const part of pathParts) {
-        if (currentSchema &&
-            currentSchema.properties &&
-            currentSchema.properties[part] &&
-            typeof currentSchema.properties[part] === 'object' &&
-            currentSchema.properties[part] !== null) {
-            currentSchema = currentSchema.properties[part];
-        }
-        else {
-            return undefined;
-        }
-    }
-    return currentSchema;
-};
-/**
- * Strips null, undefined, and empty string values from an object
- */
-const stripEmptyValues = (obj) => {
-    if (obj === null || obj === undefined) {
-        return undefined;
-    }
-    if (typeof obj === 'string' && obj.trim() === '') {
-        return undefined;
-    }
-    if (Array.isArray(obj)) {
-        const filtered = obj
-            .map(stripEmptyValues)
-            .filter((item) => item !== undefined);
-        return filtered.length > 0 ? filtered : undefined;
-    }
-    if (typeof obj === 'object' && obj !== null) {
-        const result = {};
-        let hasValues = false;
-        for (const [key, value] of Object.entries(obj)) {
-            const cleanedValue = stripEmptyValues(value);
-            if (cleanedValue !== undefined) {
-                result[key] = cleanedValue;
-                hasValues = true;
-            }
-        }
-        return hasValues ? result : undefined;
-    }
-    return obj;
-};
-/**
- * Converts AJV error objects to react-hook-form field errors format
- */
-const convertAjvErrorsToFieldErrors = (errors, schema) => {
-    if (!errors || errors.length === 0) {
-        return {};
-    }
-    const fieldErrors = {};
-    errors.forEach((error) => {
-        let fieldName = '';
-        // Special handling for required keyword: map to the specific missing property
-        if (error.keyword === 'required') {
-            const basePath = (error.instancePath || '')
-                .replace(/^\//, '')
-                .replace(/\//g, '.');
-            const missingProperty = error.params && error.params.missingProperty;
-            if (missingProperty) {
-                fieldName = basePath
-                    ? `${basePath}.${missingProperty}`
-                    : missingProperty;
-            }
-            else {
-                // Fallback to schemaPath conversion if missingProperty is unavailable
-                fieldName = (error.schemaPath || '')
-                    .replace(/^#\//, '#.')
-                    .replace(/\//g, '.');
-            }
-        }
-        else {
-            const fieldPath = error.instancePath || error.schemaPath;
-            if (fieldPath) {
-                fieldName = fieldPath.replace(/^\//, '').replace(/\//g, '.');
-            }
-        }
-        if (fieldName) {
-            // Get the schema node for this field to check for custom error messages
-            const fieldSchema = getSchemaNodeForField(schema, fieldName);
-            const customMessage = fieldSchema?.errorMessages?.[error.keyword];
-            // Debug log when error message is missing
-            if (!customMessage) {
-                console.debug(`[Form Validation] Missing error message for field '${fieldName}' with keyword '${error.keyword}'. Add errorMessages.${error.keyword} to schema for field '${fieldName}'`, {
-                    fieldName,
-                    keyword: error.keyword,
-                    instancePath: error.instancePath,
-                    schemaPath: error.schemaPath,
-                    params: error.params,
-                    fieldSchema: fieldSchema
-                        ? {
-                            type: fieldSchema.type,
-                            errorMessages: fieldSchema
-                                .errorMessages,
-                        }
-                        : undefined,
-                });
-            }
-            // Provide helpful fallback message if no custom message is provided
-            const fallbackMessage = customMessage ||
-                `Missing error message for ${error.keyword}. Add errorMessages.${error.keyword} to schema for field '${fieldName}'`;
-            if (error.keyword === 'required') {
-                // Required errors override any existing non-required errors for this field
-                fieldErrors[fieldName] = {
-                    type: 'required',
-                    keyword: error.keyword,
-                    params: error.params,
-                    message: fallbackMessage,
-                };
-            }
-            else {
-                const existing = fieldErrors[fieldName];
-                if (existing) {
-                    // Do not override required errors
-                    if (existing.type === 'required') {
-                        return;
-                    }
-                    // Combine messages if multiple errors for same field
-                    existing.message = existing.message
-                        ? `${existing.message}; ${fallbackMessage}`
-                        : fallbackMessage;
-                }
-                else {
-                    fieldErrors[fieldName] = {
-                        type: error.keyword,
-                        keyword: error.keyword,
-                        params: error.params,
-                        message: fallbackMessage,
-                    };
-                }
-            }
-        }
-    });
-    return fieldErrors;
-};
-/**
- * AJV resolver for react-hook-form
- * Integrates AJV validation with react-hook-form's validation system
- */
-const ajvResolver = (schema) => {
-    return async (values) => {
-        try {
-            // Strip empty values before validation
-            const cleanedValues = stripEmptyValues(values);
-            // Use empty object for validation if all values were stripped
-            const valuesToValidate = cleanedValues === undefined ? {} : cleanedValues;
-            const { isValid, errors } = validateData(valuesToValidate, schema);
-            console.debug('AJV Validation Result:', {
-                isValid,
-                errors,
-                cleanedValues,
-                valuesToValidate,
-            });
-            if (isValid) {
-                return {
-                    values: (cleanedValues || {}),
-                    errors: {},
-                };
-            }
-            const fieldErrors = convertAjvErrorsToFieldErrors(errors, schema);
-            console.debug('AJV Validation Failed:', {
-                errors,
-                fieldErrors,
-                cleanedValues,
-                valuesToValidate,
-            });
-            return {
-                values: {},
-                errors: fieldErrors,
-            };
-        }
-        catch (error) {
-            return {
-                values: {},
-                errors: {
-                    root: {
-                        type: 'validation',
-                        message: error instanceof Error ? error.message : 'Validation failed',
-                    },
-                },
-            };
-        }
-    };
-};
-
-const useForm = ({ preLoadedValues, schema }) => {
+function useForm({ preLoadedValues, schema, }) {
     const form = useForm$1({
         values: preLoadedValues,
         mode: 'onSubmit',
-        resolver: schema ? ajvResolver(schema) : undefined,
+        resolver: schema
+            ? ajvResolver(schema, {
+                strict: false,
+            })
+            : undefined,
         reValidateMode: 'onChange',
     });
     const [idMap, setIdMap] = useState({});
@@ -8397,7 +8087,7 @@ const useForm = ({ preLoadedValues, schema }) => {
         idMap,
         setIdMap,
     };
-};
+}
 
 const getMultiDates = ({ selected, selectedDate, selectedDates, selectable, }) => {
     if (!selectable) {

package/dist/types/components/Form/SchemaFormContext.d.ts

@@ -1,38 +1,17 @@
-import { AxiosRequestConfig } from 'axios';
-import { Dispatch, ReactNode, SetStateAction } from 'react';
+import { Dispatch, SetStateAction } from 'react';
 import { FieldValues } from 'react-hook-form';
 import { CustomJSONSchema7, DateTimePickerLabels, EnumPickerLabels, FilePickerLabels, FormButtonLabels, IdPickerLabels, TimePickerLabels } from './components/types/CustomJSONSchema7';
 export interface SchemaFormContext<TData extends FieldValues> {
     schema: CustomJSONSchema7;
-    requestUrl: string;
-    order: string[];
-    ignore: string[];
-    include: string[];
     onSubmit?: (data: TData) => Promise<void>;
-    rowNumber?: number | string;
     idMap: Record<string, object>;
     setIdMap: Dispatch<SetStateAction<Record<string, object>>>;
-    requestOptions: AxiosRequestConfig;
-    isSuccess: boolean;
-    setIsSuccess: Dispatch<SetStateAction<boolean>>;
-    isError: boolean;
-    setIsError: Dispatch<SetStateAction<boolean>>;
-    isSubmiting: boolean;
-    setIsSubmiting: Dispatch<SetStateAction<boolean>>;
-    validatedData: TData | undefined;
-    setValidatedData: Dispatch<SetStateAction<TData>>;
-    error: unknown;
-    setError: Dispatch<SetStateAction<unknown>>;
-    getUpdatedData: () => TData | Promise<TData>;
-    customErrorRenderer?: (error: unknown) => ReactNode;
-    customSuccessRenderer?: (resetHandler: () => void | Promise<void>) => ReactNode;
     timezone?: string;
     displayConfig: {
         showSubmitButton?: boolean;
         showResetButton?: boolean;
         showTitle?: boolean;
     };
-    onFormSubmit: (data: TData) => Promise<void>;
     dateTimePickerLabels?: DateTimePickerLabels;
     idPickerLabels?: IdPickerLabels;
     enumPickerLabels?: EnumPickerLabels;

package/dist/types/components/Form/components/core/FormRoot.d.ts

@@ -1,4 +1,3 @@
-import { AxiosRequestConfig } from 'axios';
 import { JSONSchema7 } from 'json-schema';
 import { Dispatch, ReactNode, SetStateAction } from 'react';
 import { FieldValues, SubmitHandler, UseFormReturn } from 'react-hook-form';
@@ -30,20 +29,11 @@ export interface FormRootProps<TData extends FieldValues> {
      * }
      */
     schema: CustomJSONSchema7;
-    requestUrl?: string;
     idMap: Record<string, object>;
     setIdMap: Dispatch<SetStateAction<Record<string, object>>>;
-    form: UseFormReturn;
+    form: UseFormReturn<TData, any, TData>;
     children: ReactNode;
-    order?: string[];
-    ignore?: string[];
-    include?: string[];
     onSubmit?: SubmitHandler<TData>;
-    rowNumber?: number | string;
-    requestOptions?: AxiosRequestConfig;
-    getUpdatedData?: () => TData | Promise<TData> | void;
-    customErrorRenderer?: (error: unknown) => ReactNode;
-    customSuccessRenderer?: (resetHandler: () => void | Promise<void>) => ReactNode;
     displayConfig?: {
         showSubmitButton?: boolean;
         showResetButton?: boolean;
@@ -64,4 +54,4 @@ export interface CustomJSONSchema7Definition extends JSONSchema7 {
     customQueryFn: any;
     children: ReactNode;
 }
-export declare const FormRoot: <TData extends FieldValues>({ schema, idMap, setIdMap, form, children, order, ignore, include, onSubmit, rowNumber, requestOptions, getUpdatedData, customErrorRenderer, customSuccessRenderer, displayConfig, dateTimePickerLabels, idPickerLabels, enumPickerLabels, filePickerLabels, formButtonLabels, timePickerLabels, insideDialog, }: FormRootProps<TData>) => import("react/jsx-runtime").JSX.Element;
+export declare const FormRoot: <TData extends FieldValues>({ schema, idMap, setIdMap, form, children, onSubmit, displayConfig, dateTimePickerLabels, idPickerLabels, enumPickerLabels, filePickerLabels, formButtonLabels, timePickerLabels, insideDialog, }: FormRootProps<TData>) => import("react/jsx-runtime").JSX.Element;

package/dist/types/components/Form/components/types/CustomJSONSchema7.d.ts

@@ -85,7 +85,7 @@ export interface CustomJSONSchema7 extends Omit<JSONSchema7, 'items' | 'addition
     gridColumn?: string;
     gridRow?: string;
     customQueryFn?: CustomQueryFn;
-    variant?: 'custom-input' | 'id-picker' | 'text-area' | 'media-library-browser' | 'tag-picker' | 'file-picker' | 'date-range' | 'enum-picker';
+    variant?: 'custom-input' | 'id-picker' | 'text-area' | 'media-library-browser' | 'tag-picker' | 'file-picker' | 'date-range' | 'enum-picker' | 'radio';
     renderDisplay?: (item: unknown) => ReactNode;
     itemToValue?: (item: unknown) => string;
     loadInitialValues?: (params: LoadInitialValuesParams) => Promise<LoadInitialValuesResult>;
@@ -108,7 +108,7 @@ export interface CustomJSONSchema7 extends Omit<JSONSchema7, 'items' | 'addition
     showLabel?: boolean;
     formatOptions?: Intl.NumberFormatOptions;
     numberStorageType?: 'string' | 'number';
-    errorMessages?: Partial<Record<ValidationErrorType | string, string>>;
+    errorMessage?: Record<Partial<ValidationErrorType> | string, string | Record<string, string>>;
     filePicker?: FilePickerProps;
     tagPicker?: {
         queryFn?: (params: {