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

package/dist/index.d.ts

@@ -7,7 +7,6 @@ import { TableHeaderProps as TableHeaderProps$1, TableRowProps, GridProps, Table
 import { IconType } from 'react-icons';
 import { UseQueryResult } from '@tanstack/react-query';
 import { RankingInfo } from '@tanstack/match-sorter-utils';
-import { AxiosRequestConfig } from 'axios';
 import { JSONSchema7 } from 'json-schema';
 import * as react_hook_form from 'react-hook-form';
 import { UseFormReturn, FieldValues, SubmitHandler } from 'react-hook-form';
@@ -591,7 +590,7 @@ interface CustomJSONSchema7 extends Omit<JSONSchema7, 'items' | 'additionalItems
     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>;
@@ -716,20 +715,11 @@ interface FormRootProps<TData extends FieldValues> {
      * }
      */
     schema: CustomJSONSchema7;
-    requestUrl?: string;
     idMap: Record<string, object>;
     setIdMap: Dispatch<SetStateAction<Record<string, object>>>;
     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;
@@ -750,7 +740,7 @@ interface CustomJSONSchema7Definition extends JSONSchema7 {
     customQueryFn: any;
     children: ReactNode;
 }
-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>) => react_jsx_runtime.JSX.Element;
+declare const FormRoot: <TData extends FieldValues>({ schema, idMap, setIdMap, form, children, onSubmit, displayConfig, dateTimePickerLabels, idPickerLabels, enumPickerLabels, filePickerLabels, formButtonLabels, timePickerLabels, insideDialog, }: FormRootProps<TData>) => react_jsx_runtime.JSX.Element;
 
 interface DefaultFormProps<TData extends FieldValues> {
     formConfig: Omit<FormRootProps<TData>, "children">;

package/dist/index.js

@@ -4187,20 +4187,13 @@ const useDataTableServer = (props) => {
 //@ts-expect-error TODO: find appropriate type
 const SchemaFormContext = React.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 = () => {
@@ -4229,8 +4222,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,
                 },
             });
@@ -4242,8 +4235,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);
@@ -4255,8 +4248,10 @@ const ArrayRenderer = ({ schema, column, prefix, }) => {
                         _dark: 'colorPalette.800',
                     }, children: [jsxRuntime.jsx(react.Grid, { gridTemplateColumns: 'repeat(12, 1fr)', autoFlow: 'row', children: jsxRuntime.jsx(SchemaRenderer, { column: `${index}`,
                                 prefix: `${colLabel}.`,
-                                // @ts-expect-error find suitable types
-                                schema: { showLabel: false, ...(items ?? {}) } }) }), jsxRuntime.jsx(react.Flex, { justifyContent: 'end', children: jsxRuntime.jsx(react.Button, { variant: 'ghost', onClick: () => {
+                                schema: {
+                                    showLabel: false,
+                                    ...(Array.isArray(items) ? items[0] : items ?? {}),
+                                } }) }), jsxRuntime.jsx(react.Flex, { justifyContent: 'end', children: jsxRuntime.jsx(react.Button, { variant: 'ghost', onClick: () => {
                                     setValue(colLabel, fields.filter((_, curIndex) => {
                                         return curIndex !== index;
                                     }));
@@ -5339,16 +5334,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 {
@@ -5358,7 +5350,6 @@ const FileDropzone = ({ children = undefined, gridProps = {}, onDrop = () => { }
                 },
             };
         }
-        // return isDark ? "lightgrey" : "white";
         return {
             backgroundColor: undefined,
             _dark: {
@@ -6241,11 +6232,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
-                    jsxRuntime.jsx(ColumnRenderer, { column: `${key}`,
+                    return (jsxRuntime.jsx(ColumnRenderer, { column: `${key}`,
                         prefix: `${prefix}${column}.`,
-                        properties,
+                        properties: properties ?? {},
                         parentRequired: required }, `form-${colLabel}-${key}`));
                 }) })] }));
 };
@@ -7987,7 +7976,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 = {
@@ -8024,15 +8014,15 @@ const ColumnRenderer = ({ column, properties, prefix, parentRequired, }) => {
 };
 
 const SubmitButton = () => {
-    const { setValidatedData, setIsError, onFormSubmit, formButtonLabels } = useSchemaContext();
+    const { onSubmit, formButtonLabels } = useSchemaContext();
     const methods = reactHookForm.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 (jsxRuntime.jsx(react.Button, { onClick: () => {
             methods.handleSubmit(onValid)();
@@ -8040,33 +8030,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 = reactHookForm.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 (jsxRuntime.jsxs(react.Flex, { flexFlow: 'column', gap: "2", children: [jsxRuntime.jsx(react.Grid, { gap: "4", gridTemplateColumns: 'repeat(12, 1fr)', autoFlow: 'row', children: ordered.map((column) => {
-                    return (jsxRuntime.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 (jsxRuntime.jsx(ColumnRenderer, { properties: properties, prefix: ``, parentRequired: schema.required, column }, `form-input-${column}`));
                 }) }), jsxRuntime.jsxs(react.Flex, { justifyContent: 'end', gap: "2", children: [showResetButton && (jsxRuntime.jsx(react.Button, { onClick: () => {
                             methods.reset();
-                        }, variant: 'subtle', children: formButtonLabels?.reset ?? 'Reset' })), showSubmitButton && jsxRuntime.jsx(SubmitButton, {})] }), isError && customErrorRenderer && customErrorRenderer(error)] }));
+                        }, variant: 'subtle', children: formButtonLabels?.reset ?? 'Reset' })), showSubmitButton && jsxRuntime.jsx(SubmitButton, {})] })] }));
 };
 
 const FormTitle = () => {
@@ -8085,96 +8063,18 @@ const FormTitle = () => {
     return jsxRuntime.jsx(react.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] = React.useState(false);
-    const [isError, setIsError] = React.useState(false);
-    const [isSubmiting, setIsSubmiting] = React.useState(false);
-    const [validatedData, setValidatedData] = React.useState();
-    const [error, setError] = React.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 (jsxRuntime.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,

package/dist/index.mjs

@@ -4167,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 = () => {
@@ -4209,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,
                 },
             });
@@ -4222,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);
@@ -4235,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;
                                     }));
@@ -5319,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 {
@@ -5338,7 +5330,6 @@ const FileDropzone = ({ children = undefined, gridProps = {}, onDrop = () => { }
                 },
             };
         }
-        // return isDark ? "lightgrey" : "white";
         return {
             backgroundColor: undefined,
             _dark: {
@@ -6221,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}`));
                 }) })] }));
 };
@@ -7967,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 = {
@@ -8004,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)();
@@ -8020,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 = () => {
@@ -8065,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,

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<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>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsol-oss/react-datatable5",
-  "version": "13.0.1-beta.27",
+  "version": "13.0.1-beta.28",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.mjs",