@bsol-oss/react-datatable5 11.0.0-beta.9 → 12.0.0-beta.1

package/dist/index.js

@@ -4206,7 +4206,7 @@ const getTableData = async ({ serverUrl, in_table, searching = "", where = [], l
 
 const IdPicker = ({ column, schema, prefix, isMultiple = false, }) => {
     const { watch, formState: { errors }, setValue, } = reactHookForm.useFormContext();
-    const { serverUrl, idMap, setIdMap, translate } = useSchemaContext();
+    const { serverUrl, idMap, setIdMap, translate, schema: parentSchema, } = useSchemaContext();
     const { required, gridColumn, gridRow, renderDisplay, foreign_key } = schema;
     const isRequired = required?.some((columnId) => columnId === column);
     const { table, column: column_ref, display_column, } = foreign_key;
@@ -4249,7 +4249,10 @@ const IdPicker = ({ column, schema, prefix, isMultiple = false, }) => {
     const watchId = watch(colLabel);
     const watchIds = (watch(colLabel) ?? []);
     reactQuery.useQuery({
-        queryKey: [`idpicker`, { column, searchText, limit, page }],
+        queryKey: [
+            `idpicker`,
+            { form: parentSchema.title, column, searchText, limit, page },
+        ],
         queryFn: async () => {
             const data = await getTableData({
                 serverUrl,
@@ -4338,12 +4341,15 @@ react.NumberInput.Scrubber;
 react.NumberInput.Label;
 
 const NumberInputField = ({ schema, column, prefix, }) => {
-    const { register, formState: { errors }, watch } = reactHookForm.useFormContext();
+    const { setValue, formState: { errors }, watch, } = reactHookForm.useFormContext();
     const { translate } = useSchemaContext();
     const { required, gridColumn, gridRow } = schema;
     const isRequired = required?.some((columnId) => columnId === column);
     const colLabel = `${prefix}${column}`;
-    return (jsxRuntime.jsxs(Field, { label: `${translate.t(removeIndex(`${colLabel}.fieldLabel`))}`, required: isRequired, gridColumn, gridRow, children: [jsxRuntime.jsx(NumberInputRoot, { children: jsxRuntime.jsx(NumberInputField$1, { ...register(`${colLabel}`, { required: isRequired }) }) }), errors[`${column}`] && (jsxRuntime.jsx(react.Text, { color: "red.400", children: translate.t(removeIndex(`${colLabel}.fieldRequired`)) }))] }));
+    const value = watch(`${colLabel}`);
+    return (jsxRuntime.jsxs(Field, { label: `${translate.t(removeIndex(`${colLabel}.fieldLabel`))}`, required: isRequired, gridColumn, gridRow, children: [jsxRuntime.jsx(NumberInputRoot, { children: jsxRuntime.jsx(NumberInputField$1, { required: isRequired, value: value, onChange: (event) => {
+                        setValue(`${colLabel}`, Number(event.target.value));
+                    } }) }), errors[`${column}`] && (jsxRuntime.jsx(react.Text, { color: "red.400", children: translate.t(removeIndex(`${colLabel}.fieldRequired`)) }))] }));
 };
 
 const ObjectInput = ({ schema, column, prefix }) => {
@@ -5046,9 +5052,9 @@ const FormInternal = () => {
                             }, formNoValidate: true, children: translate.t("submit") })] })] }) }));
 };
 const Form = ({ schema, idMap, setIdMap, form, serverUrl, translate, order = [], ignore = [], include = [], onSubmit = undefined, rowNumber = undefined, requestOptions = {}, }) => {
-    const { properties } = schema;
-    idListSanityCheck("order", order, properties);
-    idListSanityCheck("ignore", ignore, properties);
+    // const { properties } = schema;
+    // idListSanityCheck("order", order, properties as object);
+    // idListSanityCheck("ignore", ignore, properties as object);
     return (jsxRuntime.jsx(SchemaFormContext.Provider, { value: {
             schema,
             serverUrl,

package/dist/index.mjs

@@ -4186,7 +4186,7 @@ const getTableData = async ({ serverUrl, in_table, searching = "", where = [], l
 
 const IdPicker = ({ column, schema, prefix, isMultiple = false, }) => {
     const { watch, formState: { errors }, setValue, } = useFormContext();
-    const { serverUrl, idMap, setIdMap, translate } = useSchemaContext();
+    const { serverUrl, idMap, setIdMap, translate, schema: parentSchema, } = useSchemaContext();
     const { required, gridColumn, gridRow, renderDisplay, foreign_key } = schema;
     const isRequired = required?.some((columnId) => columnId === column);
     const { table, column: column_ref, display_column, } = foreign_key;
@@ -4229,7 +4229,10 @@ const IdPicker = ({ column, schema, prefix, isMultiple = false, }) => {
     const watchId = watch(colLabel);
     const watchIds = (watch(colLabel) ?? []);
     useQuery({
-        queryKey: [`idpicker`, { column, searchText, limit, page }],
+        queryKey: [
+            `idpicker`,
+            { form: parentSchema.title, column, searchText, limit, page },
+        ],
         queryFn: async () => {
             const data = await getTableData({
                 serverUrl,
@@ -4318,12 +4321,15 @@ NumberInput.Scrubber;
 NumberInput.Label;
 
 const NumberInputField = ({ schema, column, prefix, }) => {
-    const { register, formState: { errors }, watch } = useFormContext();
+    const { setValue, formState: { errors }, watch, } = useFormContext();
     const { translate } = useSchemaContext();
     const { required, gridColumn, gridRow } = schema;
     const isRequired = required?.some((columnId) => columnId === column);
     const colLabel = `${prefix}${column}`;
-    return (jsxs(Field, { label: `${translate.t(removeIndex(`${colLabel}.fieldLabel`))}`, required: isRequired, gridColumn, gridRow, children: [jsx(NumberInputRoot, { children: jsx(NumberInputField$1, { ...register(`${colLabel}`, { required: isRequired }) }) }), errors[`${column}`] && (jsx(Text, { color: "red.400", children: translate.t(removeIndex(`${colLabel}.fieldRequired`)) }))] }));
+    const value = watch(`${colLabel}`);
+    return (jsxs(Field, { label: `${translate.t(removeIndex(`${colLabel}.fieldLabel`))}`, required: isRequired, gridColumn, gridRow, children: [jsx(NumberInputRoot, { children: jsx(NumberInputField$1, { required: isRequired, value: value, onChange: (event) => {
+                        setValue(`${colLabel}`, Number(event.target.value));
+                    } }) }), errors[`${column}`] && (jsx(Text, { color: "red.400", children: translate.t(removeIndex(`${colLabel}.fieldRequired`)) }))] }));
 };
 
 const ObjectInput = ({ schema, column, prefix }) => {
@@ -5026,9 +5032,9 @@ const FormInternal = () => {
                             }, formNoValidate: true, children: translate.t("submit") })] })] }) }));
 };
 const Form = ({ schema, idMap, setIdMap, form, serverUrl, translate, order = [], ignore = [], include = [], onSubmit = undefined, rowNumber = undefined, requestOptions = {}, }) => {
-    const { properties } = schema;
-    idListSanityCheck("order", order, properties);
-    idListSanityCheck("ignore", ignore, properties);
+    // const { properties } = schema;
+    // idListSanityCheck("order", order, properties as object);
+    // idListSanityCheck("ignore", ignore, properties as object);
     return (jsx(SchemaFormContext.Provider, { value: {
             schema,
             serverUrl,

package/package.json

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