@bsol-oss/react-datatable5 13.0.1-beta.35 → 13.0.1-beta.37

package/dist/index.d.ts

@@ -9,7 +9,7 @@ import { UseQueryResult } from '@tanstack/react-query';
 import { RankingInfo } from '@tanstack/match-sorter-utils';
 import { JSONSchema7 } from 'json-schema';
 import * as react_hook_form from 'react-hook-form';
-import { UseFormReturn, FieldValues, SubmitHandler } from 'react-hook-form';
+import { UseFormReturn, FieldValues } from 'react-hook-form';
 import dayjs from 'dayjs';
 
 interface TableHeaderTexts {
@@ -700,7 +700,6 @@ interface FormRootProps<TData extends FieldValues> {
     setIdMap: Dispatch<SetStateAction<Record<string, unknown>>>;
     form: UseFormReturn<TData, any, TData>;
     children: ReactNode;
-    onSubmit?: SubmitHandler<TData>;
     displayConfig?: {
         showSubmitButton?: boolean;
         showResetButton?: boolean;
@@ -721,7 +720,7 @@ interface CustomJSONSchema7Definition extends JSONSchema7 {
     customQueryFn: any;
     children: ReactNode;
 }
-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;
+declare const FormRoot: <TData extends FieldValues>({ schema, idMap, setIdMap, form, children, 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

@@ -4191,8 +4191,8 @@ const SchemaFormContext = React.createContext({
     onSubmit: async () => { },
     timezone: 'Asia/Hong_Kong',
     displayConfig: {
-        showSubmitButton: true,
-        showResetButton: true,
+        showSubmitButton: false,
+        showResetButton: false,
         showTitle: true,
     },
 });
@@ -7087,34 +7087,6 @@ function DateTimePicker$1({ value, onChange, format = 'date-time', showSeconds =
         }
     };
     // Display text for buttons
-    React.useMemo(() => {
-        if (!selectedDate)
-            return labels?.selectDateLabel ?? 'Select date';
-        return dayjs(selectedDate).tz(tz).format('YYYY-MM-DD');
-    }, [selectedDate, tz, labels]);
-    React.useMemo(() => {
-        const selectTimeLabel = timePickerLabels?.selectTimeLabel ?? 'Select time';
-        if (hour === null || minute === null)
-            return selectTimeLabel;
-        if (is24Hour) {
-            // 24-hour format: never show meridiem, always use 24-hour format (0-23)
-            const hour24 = hour >= 0 && hour <= 23 ? hour : hour % 24;
-            const s = second ?? 0;
-            if (showSeconds) {
-                return `${hour24.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`;
-            }
-            return `${hour24.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`;
-        }
-        else {
-            // 12-hour format: always show meridiem (AM/PM)
-            const hour12 = hour >= 1 && hour <= 12 ? hour : hour % 12;
-            if (meridiem === null)
-                return selectTimeLabel;
-            const hourDisplay = hour12.toString();
-            const minuteDisplay = minute.toString().padStart(2, '0');
-            return `${hourDisplay}:${minuteDisplay} ${meridiem.toUpperCase()}`;
-        }
-    }, [hour, minute, second, meridiem, is24Hour, showSeconds, timePickerLabels]);
     const timezoneDisplayText = React.useMemo(() => {
         if (!showTimezoneSelector)
             return '';
@@ -7905,9 +7877,9 @@ const FormBody = () => {
                         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: () => {
+                }) }), (showResetButton || showSubmitButton) && (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, {})] })] }));
+                        }, variant: 'subtle', children: formButtonLabels?.reset ?? 'Reset' })), showSubmitButton && jsxRuntime.jsx(SubmitButton, {})] }))] }));
 };
 
 const FormTitle = () => {
@@ -7926,15 +7898,13 @@ const FormTitle = () => {
     return jsxRuntime.jsx(react.Heading, { children: schema.title ?? 'Form' });
 };
 
-const FormRoot = ({ schema, idMap, setIdMap, form, children, onSubmit = undefined, displayConfig = {
-    showSubmitButton: true,
-    showResetButton: true,
+const FormRoot = ({ schema, idMap, setIdMap, form, children, displayConfig = {
+    showSubmitButton: false,
+    showResetButton: false,
     showTitle: true,
 }, dateTimePickerLabels, idPickerLabels, enumPickerLabels, filePickerLabels, formButtonLabels, timePickerLabels, insideDialog = false, }) => {
     return (jsxRuntime.jsx(SchemaFormContext.Provider, { value: {
             schema,
-            // @ts-expect-error TODO: find appropriate types
-            onSubmit,
             idMap,
             setIdMap,
             displayConfig,

package/dist/index.mjs

@@ -4171,8 +4171,8 @@ const SchemaFormContext = createContext({
     onSubmit: async () => { },
     timezone: 'Asia/Hong_Kong',
     displayConfig: {
-        showSubmitButton: true,
-        showResetButton: true,
+        showSubmitButton: false,
+        showResetButton: false,
         showTitle: true,
     },
 });
@@ -7067,34 +7067,6 @@ function DateTimePicker$1({ value, onChange, format = 'date-time', showSeconds =
         }
     };
     // Display text for buttons
-    useMemo(() => {
-        if (!selectedDate)
-            return labels?.selectDateLabel ?? 'Select date';
-        return dayjs(selectedDate).tz(tz).format('YYYY-MM-DD');
-    }, [selectedDate, tz, labels]);
-    useMemo(() => {
-        const selectTimeLabel = timePickerLabels?.selectTimeLabel ?? 'Select time';
-        if (hour === null || minute === null)
-            return selectTimeLabel;
-        if (is24Hour) {
-            // 24-hour format: never show meridiem, always use 24-hour format (0-23)
-            const hour24 = hour >= 0 && hour <= 23 ? hour : hour % 24;
-            const s = second ?? 0;
-            if (showSeconds) {
-                return `${hour24.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`;
-            }
-            return `${hour24.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`;
-        }
-        else {
-            // 12-hour format: always show meridiem (AM/PM)
-            const hour12 = hour >= 1 && hour <= 12 ? hour : hour % 12;
-            if (meridiem === null)
-                return selectTimeLabel;
-            const hourDisplay = hour12.toString();
-            const minuteDisplay = minute.toString().padStart(2, '0');
-            return `${hourDisplay}:${minuteDisplay} ${meridiem.toUpperCase()}`;
-        }
-    }, [hour, minute, second, meridiem, is24Hour, showSeconds, timePickerLabels]);
     const timezoneDisplayText = useMemo(() => {
         if (!showTimezoneSelector)
             return '';
@@ -7885,9 +7857,9 @@ const FormBody = () => {
                         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: () => {
+                }) }), (showResetButton || showSubmitButton) && (jsxs(Flex, { justifyContent: 'end', gap: "2", children: [showResetButton && (jsx(Button$1, { onClick: () => {
                             methods.reset();
-                        }, variant: 'subtle', children: formButtonLabels?.reset ?? 'Reset' })), showSubmitButton && jsx(SubmitButton, {})] })] }));
+                        }, variant: 'subtle', children: formButtonLabels?.reset ?? 'Reset' })), showSubmitButton && jsx(SubmitButton, {})] }))] }));
 };
 
 const FormTitle = () => {
@@ -7906,15 +7878,13 @@ const FormTitle = () => {
     return jsx(Heading, { children: schema.title ?? 'Form' });
 };
 
-const FormRoot = ({ schema, idMap, setIdMap, form, children, onSubmit = undefined, displayConfig = {
-    showSubmitButton: true,
-    showResetButton: true,
+const FormRoot = ({ schema, idMap, setIdMap, form, children, displayConfig = {
+    showSubmitButton: false,
+    showResetButton: false,
     showTitle: true,
 }, dateTimePickerLabels, idPickerLabels, enumPickerLabels, filePickerLabels, formButtonLabels, timePickerLabels, insideDialog = false, }) => {
     return (jsx(SchemaFormContext.Provider, { value: {
             schema,
-            // @ts-expect-error TODO: find appropriate types
-            onSubmit,
             idMap,
             setIdMap,
             displayConfig,

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

@@ -1,6 +1,6 @@
 import { JSONSchema7 } from 'json-schema';
 import { Dispatch, ReactNode, SetStateAction } from 'react';
-import { FieldValues, SubmitHandler, UseFormReturn } from 'react-hook-form';
+import { FieldValues, UseFormReturn } from 'react-hook-form';
 import { CustomJSONSchema7, DateTimePickerLabels, EnumPickerLabels, FilePickerLabels, FormButtonLabels, IdPickerLabels, TimePickerLabels } from '../types/CustomJSONSchema7';
 export interface FormRootProps<TData extends FieldValues> {
     /**
@@ -33,7 +33,6 @@ export interface FormRootProps<TData extends FieldValues> {
     setIdMap: Dispatch<SetStateAction<Record<string, unknown>>>;
     form: UseFormReturn<TData, any, TData>;
     children: ReactNode;
-    onSubmit?: SubmitHandler<TData>;
     displayConfig?: {
         showSubmitButton?: boolean;
         showResetButton?: boolean;
@@ -54,4 +53,4 @@ export interface CustomJSONSchema7Definition extends JSONSchema7 {
     customQueryFn: any;
     children: ReactNode;
 }
-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;
+export declare const FormRoot: <TData extends FieldValues>({ schema, idMap, setIdMap, form, children, displayConfig, dateTimePickerLabels, idPickerLabels, enumPickerLabels, filePickerLabels, formButtonLabels, timePickerLabels, insideDialog, }: FormRootProps<TData>) => import("react/jsx-runtime").JSX.Element;

package/package.json

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