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

package/dist/index.d.ts

@@ -614,7 +614,7 @@ interface CustomJSONSchema7 extends Omit<JSONSchema7, 'items' | 'additionalItems
     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: {
@@ -719,7 +719,7 @@ interface FormRootProps<TData extends FieldValues> {
     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[];
@@ -783,17 +783,12 @@ type MediaLibraryBrowserPropsMultiple = MediaLibraryBrowserPropsBase & {
 type MediaLibraryBrowserProps = MediaLibraryBrowserPropsSingle | MediaLibraryBrowserPropsMultiple;
 declare const MediaLibraryBrowser: ({ onFetchFiles, filterImageOnly, labels, enabled, multiple, onFileSelect, selectedFile: controlledSelectedFile, onSelectedFileChange, }: MediaLibraryBrowserProps) => react_jsx_runtime.JSX.Element | null;
 
-interface Translate {
-    t: (key: string, options?: any) => string;
-    i18n?: any;
-    ready?: boolean;
-}
-interface UseFormProps {
-    preLoadedValues?: FieldValues | undefined;
+interface UseFormProps<T> {
+    preLoadedValues?: T | undefined;
     schema?: CustomJSONSchema7;
 }
-declare const useForm: ({ preLoadedValues, schema }: UseFormProps) => {
-    form: react_hook_form.UseFormReturn<FieldValues, any, undefined>;
+declare function useForm<T extends FieldValues = any>({ preLoadedValues, schema, }: UseFormProps<T>): {
+    form: react_hook_form.UseFormReturn<T, any, T>;
     idMap: Record<string, object>;
     setIdMap: React$1.Dispatch<React$1.SetStateAction<Record<string, object>>>;
 };
@@ -1259,4 +1254,4 @@ declare module '@tanstack/react-table' {
     }
 }
 
-export { CalendarDisplay, type CalendarDisplayProps, type CalendarEvent, type CalendarProps, CardHeader, type CardHeaderProps, type CustomJSONSchema7, type CustomJSONSchema7Definition, DataDisplay, type DataDisplayProps, type DataResponse, DataTable, type DataTableDefaultState, type DataTableProps, DataTableServer, type DataTableServerProps, DatePickerContext, DatePickerInput, type DatePickerInputProps, type DatePickerLabels, type DatePickerProps, type DateTimePickerLabels, DefaultCardTitle, DefaultForm, type DefaultFormProps, DefaultTable, type DefaultTableProps, DefaultTableServer, type DefaultTableServerProps, DensityToggleButton, type DensityToggleButtonProps, type EditFilterButtonProps, EditSortingButton, type EditSortingButtonProps, type EditViewButtonProps, EmptyState, type EmptyStateProps, type EnumPickerLabels, ErrorAlert, type ErrorAlertProps, type FilePickerLabels, type FilePickerMediaFile, type FilePickerProps, FilterDialog, FormBody, type FormButtonLabels, FormRoot, type FormRootProps, FormTitle, type GetDateColorProps, type GetMultiDatesProps, type GetRangeDatesProps, type GetStyleProps, type GetVariantProps, GlobalFilter, type IdPickerLabels, type LoadInitialValuesParams, type LoadInitialValuesResult, MediaLibraryBrowser, type MediaLibraryBrowserProps, PageSizeControl, type PageSizeControlProps, Pagination, type QueryParams, type RangeCalendarProps, type RangeDatePickerLabels, type RangeDatePickerProps, RecordDisplay, type RecordDisplayProps, ReloadButton, type ReloadButtonProps, ResetFilteringButton, ResetSelectionButton, ResetSortingButton, type Result, RowCountText, SelectAllRowsToggle, type SelectAllRowsToggleProps, Table, TableBody, type TableBodyProps, TableCardContainer, type TableCardContainerProps, TableCards, type TableCardsProps, TableComponent, TableControls, type TableControlsProps, TableDataDisplay, type TableDataDisplayProps, TableFilter, TableFilterTags, type TableFilterTagsProps, TableFooter, type TableFooterProps, TableHeader, type TableHeaderProps, type TableHeaderTexts, TableLoadingComponent, type TableLoadingComponentProps, type TableProps, type TableRendererProps, type TableRowSelectorProps, TableSelector, TableSorter, TableViewer, type TagPickerProps, TextCell, type TextCellProps, type TimePickerLabels, type Translate, type UseDataTableProps, type UseDataTableReturn, type UseDataTableServerProps, type UseDataTableServerReturn, type UseFormProps, type ValidationErrorType, ViewDialog, defaultRenderDisplay, getMultiDates, getRangeDates, useDataTable, useDataTableContext, useDataTableServer, useForm };
+export { CalendarDisplay, type CalendarDisplayProps, type CalendarEvent, type CalendarProps, CardHeader, type CardHeaderProps, type CustomJSONSchema7, type CustomJSONSchema7Definition, DataDisplay, type DataDisplayProps, type DataResponse, DataTable, type DataTableDefaultState, type DataTableProps, DataTableServer, type DataTableServerProps, DatePickerContext, DatePickerInput, type DatePickerInputProps, type DatePickerLabels, type DatePickerProps, type DateTimePickerLabels, DefaultCardTitle, DefaultForm, type DefaultFormProps, DefaultTable, type DefaultTableProps, DefaultTableServer, type DefaultTableServerProps, DensityToggleButton, type DensityToggleButtonProps, type EditFilterButtonProps, EditSortingButton, type EditSortingButtonProps, type EditViewButtonProps, EmptyState, type EmptyStateProps, type EnumPickerLabels, ErrorAlert, type ErrorAlertProps, type FilePickerLabels, type FilePickerMediaFile, type FilePickerProps, FilterDialog, FormBody, type FormButtonLabels, FormRoot, type FormRootProps, FormTitle, type GetDateColorProps, type GetMultiDatesProps, type GetRangeDatesProps, type GetStyleProps, type GetVariantProps, GlobalFilter, type IdPickerLabels, type LoadInitialValuesParams, type LoadInitialValuesResult, MediaLibraryBrowser, type MediaLibraryBrowserProps, PageSizeControl, type PageSizeControlProps, Pagination, type QueryParams, type RangeCalendarProps, type RangeDatePickerLabels, type RangeDatePickerProps, RecordDisplay, type RecordDisplayProps, ReloadButton, type ReloadButtonProps, ResetFilteringButton, ResetSelectionButton, ResetSortingButton, type Result, RowCountText, SelectAllRowsToggle, type SelectAllRowsToggleProps, Table, TableBody, type TableBodyProps, TableCardContainer, type TableCardContainerProps, TableCards, type TableCardsProps, TableComponent, TableControls, type TableControlsProps, TableDataDisplay, type TableDataDisplayProps, TableFilter, TableFilterTags, type TableFilterTagsProps, TableFooter, type TableFooterProps, TableHeader, type TableHeaderProps, type TableHeaderTexts, TableLoadingComponent, type TableLoadingComponentProps, type TableProps, type TableRendererProps, type TableRowSelectorProps, TableSelector, TableSorter, TableViewer, type TagPickerProps, TextCell, type TextCellProps, type TimePickerLabels, type UseDataTableProps, type UseDataTableReturn, type UseDataTableServerProps, type UseDataTableServerReturn, type UseFormProps, type ValidationErrorType, ViewDialog, defaultRenderDisplay, getMultiDates, getRangeDates, useDataTable, useDataTableContext, useDataTableServer, useForm };

package/dist/index.js

@@ -31,9 +31,7 @@ var customParseFormat = require('dayjs/plugin/customParseFormat');
 var timezone = require('dayjs/plugin/timezone');
 var utc = require('dayjs/plugin/utc');
 var ti = require('react-icons/ti');
-var Ajv = require('ajv');
-var addFormats = require('ajv-formats');
-var AjvErrors = require('ajv-errors');
+var ajv = require('@hookform/resolvers/ajv');
 var matchSorterUtils = require('@tanstack/match-sorter-utils');
 
 function _interopNamespaceDefault(e) {
@@ -1153,7 +1151,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;
 
@@ -2258,8 +2256,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) {
@@ -2563,11 +2561,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;
@@ -8192,223 +8190,15 @@ const DefaultForm = ({ formConfig, }) => {
     return (jsxRuntime.jsx(FormRoot, { ...formConfig, children: jsxRuntime.jsxs(react.Grid, { gap: "2", children: [showTitle && jsxRuntime.jsx(FormTitle, {}), jsxRuntime.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 = reactHookForm.useForm({
         values: preLoadedValues,
         mode: 'onSubmit',
-        resolver: schema ? ajvResolver(schema) : undefined,
+        resolver: schema
+            ? ajv.ajvResolver(schema, {
+                strict: false,
+            })
+            : undefined,
         reValidateMode: 'onChange',
     });
     const [idMap, setIdMap] = React.useState({});
@@ -8417,7 +8207,7 @@ const useForm = ({ preLoadedValues, schema }) => {
         idMap,
         setIdMap,
     };
-};
+}
 
 const getMultiDates = ({ selected, selectedDate, selectedDates, selectable, }) => {
     if (!selectable) {

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;
@@ -8172,223 +8170,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 +8187,7 @@ const useForm = ({ preLoadedValues, schema }) => {
         idMap,
         setIdMap,
     };
-};
+}
 
 const getMultiDates = ({ selected, selectedDate, selectedDates, selectable, }) => {
     if (!selectable) {

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

@@ -33,7 +33,7 @@ export interface FormRootProps<TData extends FieldValues> {
     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[];

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

@@ -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: {

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

@@ -1,17 +1,12 @@
 /// <reference types="react" />
 import { FieldValues } from 'react-hook-form';
 import { CustomJSONSchema7 } from './components/types/CustomJSONSchema7';
-export interface Translate {
-    t: (key: string, options?: any) => string;
-    i18n?: any;
-    ready?: boolean;
-}
-export interface UseFormProps {
-    preLoadedValues?: FieldValues | undefined;
+export interface UseFormProps<T> {
+    preLoadedValues?: T | undefined;
     schema?: CustomJSONSchema7;
 }
-export declare const useForm: ({ preLoadedValues, schema }: UseFormProps) => {
-    form: import("react-hook-form").UseFormReturn<FieldValues, any, undefined>;
+export declare function useForm<T extends FieldValues = any>({ preLoadedValues, schema, }: UseFormProps<T>): {
+    form: import("react-hook-form").UseFormReturn<T, any, T>;
     idMap: Record<string, object>;
     setIdMap: import("react").Dispatch<import("react").SetStateAction<Record<string, object>>>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsol-oss/react-datatable5",
-  "version": "13.0.1-beta.26",
+  "version": "13.0.1-beta.27",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -91,5 +91,8 @@
     "*.{ts,js,json,md,tsx}": [
       "prettier --config ./.prettierrc --write"
     ]
+  },
+  "dependencies": {
+    "@hookform/resolvers": "^5.2.2"
   }
 }