drf-react-by-schema 0.15.5 → 0.15.6

package/dist/components/DataGridBySchemaEditable.js

@@ -653,7 +653,6 @@ const DataGridBySchemaEditable = (0, react_1.forwardRef)(({ schema, data, rowCou
             newRow: editedRow,
             schema,
         });
-        console.log(response);
         setDataGridLoading(false);
         if (response !== false) {
             updateOptionsAC();

package/dist/components/forms/FieldBySchema.js

@@ -26,9 +26,9 @@ function FieldBySchema(_a) {
     var { name, schema, control, errors, multiline = false, setValue, getValues, fieldKey, labelKey = 'nome', index, optionsAC, optionsModel, getOptionLabel, renderOption, onEditModel, sx, options, isSemaphoric = false, label, onValueChange, decimalScale = 2 } = _a, other = __rest(_a, ["name", "schema", "control", "errors", "multiline", "setValue", "getValues", "fieldKey", "labelKey", "index", "optionsAC", "optionsModel", "getOptionLabel", "renderOption", "onEditModel", "sx", "options", "isSemaphoric", "label", "onValueChange", "decimalScale"]);
     switch (schema[name].type) {
         case 'date':
-            return (react_1.default.createElement(DesktopDatePickerBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, multiline: multiline, fieldKey: fieldKey, index: index, sx: sx }, other)));
+            return (react_1.default.createElement(DesktopDatePickerBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, multiline: multiline, fieldKey: fieldKey, index: index, sx: sx, onValueChange: onValueChange }, other)));
         case 'datetime':
-            return (react_1.default.createElement(DesktopDateTimePickerBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, multiline: multiline, fieldKey: fieldKey, index: index, sx: sx }, other)));
+            return (react_1.default.createElement(DesktopDateTimePickerBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, multiline: multiline, fieldKey: fieldKey, index: index, sx: sx, onValueChange: onValueChange }, other)));
         // case 'field':
         //     return (
         //         <AutocompleteFieldBySchema
@@ -45,9 +45,9 @@ function FieldBySchema(_a) {
         case 'field':
             const relatedEditable = schema[name].related_editable;
             const multiple = schema[name].many || false;
-            return (react_1.default.createElement(EditableAutocompleteFieldBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, setValue: setValue, getValues: getValues, fieldKey: fieldKey, labelKey: labelKey, index: index, optionsAC: optionsAC, optionsModel: optionsModel, getOptionLabel: getOptionLabel, renderOption: renderOption, onEditModel: relatedEditable ? onEditModel : undefined, multiple: multiple, sx: sx }, other)));
+            return (react_1.default.createElement(EditableAutocompleteFieldBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, setValue: setValue, getValues: getValues, fieldKey: fieldKey, labelKey: labelKey, index: index, optionsAC: optionsAC, optionsModel: optionsModel, getOptionLabel: getOptionLabel, renderOption: renderOption, onEditModel: relatedEditable ? onEditModel : undefined, multiple: multiple, sx: sx, onValueChange: onValueChange }, other)));
         case 'choice':
-            return (react_1.default.createElement(AutocompleteFieldBySchema_1.default, { index: index, name: name, schema: schema, control: control, errors: errors, fieldKey: fieldKey, optionIdKey: "value", optionLabelKey: "display_name", options: options, isSemaphoric: isSemaphoric, label: label, sx: sx }));
+            return (react_1.default.createElement(AutocompleteFieldBySchema_1.default, { index: index, name: name, schema: schema, control: control, errors: errors, fieldKey: fieldKey, optionIdKey: "value", optionLabelKey: "display_name", options: options, isSemaphoric: isSemaphoric, label: label, sx: sx, onValueChange: onValueChange }));
         case 'boolean':
             return (react_1.default.createElement(BooleanFieldBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, fieldKey: fieldKey, index: index, sx: sx, onValueChange: onValueChange }, other)));
         case 'decimal':
@@ -59,7 +59,7 @@ function FieldBySchema(_a) {
         default:
             const localMultiline = schema[name].model_multiline === true || multiline;
             const minRows = localMultiline ? 3 : 0;
-            return (react_1.default.createElement(TextFieldBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, multiline: localMultiline, minRows: minRows, fieldKey: fieldKey, index: index, sx: sx, isPassword: schema[name].type === 'password' }, other)));
+            return (react_1.default.createElement(TextFieldBySchema_1.default, Object.assign({ name: name, schema: schema, control: control, errors: errors, multiline: localMultiline, minRows: minRows, fieldKey: fieldKey, index: index, sx: sx, isPassword: schema[name].type === 'password', onValueChange: onValueChange }, other)));
     }
 }
 exports.default = FieldBySchema;

package/dist/components/forms/FormBySchema.js

@@ -98,17 +98,23 @@ function FormBySchema({ schema, control, errors, register, multiline = false, se
         return { newFieldsLayout: [{ rows }], optionsACModels };
     };
     const populateOptionsAC = (optionsACModels) => __awaiter(this, void 0, void 0, function* () {
+        const promises = [];
+        const fieldsToLoad = [];
+        optionsACModels.map((field) => {
+            if (!optionsAC || !(field in optionsAC)) {
+                fieldsToLoad.push(field);
+                promises.push(isolatedGetAutoComplete
+                    ? isolatedGetAutoComplete(field)
+                    : getAutoComplete(field));
+            }
+        });
         const newOptionsAC = {};
-        for (const model of optionsACModels) {
-            if (!optionsAC || !optionsAC[model]) {
-                const ret = isolatedGetAutoComplete
-                    ? yield isolatedGetAutoComplete(model)
-                    : yield getAutoComplete(model);
-                if (ret !== false) {
-                    newOptionsAC[model] = ret;
-                }
+        const results = yield Promise.all(promises);
+        results.map((result, index) => {
+            if (result !== false) {
+                newOptionsAC[fieldsToLoad[index]] = result;
             }
-        }
+        });
         if (setOptionsAC) {
             setOptionsAC(newOptionsAC);
             return;

package/dist/components/forms/inputs/AutocompleteFieldBySchema.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { FieldBySchemaProps } from '../../../utils';
-export default function AutocompleteFieldBySchema({ fieldKey, index, name, schema, control, errors, optionIdKey, optionLabelKey, options, isSemaphoric, sx, label, ...other }: FieldBySchemaProps): React.JSX.Element;
+export default function AutocompleteFieldBySchema({ fieldKey, index, name, schema, control, errors, optionIdKey, optionLabelKey, options, isSemaphoric, sx, onValueChange, ...other }: FieldBySchemaProps): React.JSX.Element;

package/dist/components/forms/inputs/AutocompleteFieldBySchema.js

@@ -55,7 +55,7 @@ const renderInput = (_a) => {
     return (react_1.default.createElement(TextField_1.default, Object.assign({}, params, { label: label || schema[model].label, required: schema[model].required, margin: "normal", error: error, helperText: helperText, sx: sx })));
 };
 function AutocompleteFieldBySchema(_a) {
-    var { fieldKey, index, name, schema, control, errors, optionIdKey = 'id', optionLabelKey = 'label', options, isSemaphoric = false, sx = { mr: 2 }, label } = _a, other = __rest(_a, ["fieldKey", "index", "name", "schema", "control", "errors", "optionIdKey", "optionLabelKey", "options", "isSemaphoric", "sx", "label"]);
+    var { fieldKey, index, name, schema, control, errors, optionIdKey = 'id', optionLabelKey = 'label', options, isSemaphoric = false, sx = { mr: 2 }, onValueChange } = _a, other = __rest(_a, ["fieldKey", "index", "name", "schema", "control", "errors", "optionIdKey", "optionLabelKey", "options", "isSemaphoric", "sx", "onValueChange"]);
     const model = name;
     const { theme } = (0, DRFReactBySchemaContext_1.useDRFReactBySchema)();
     if (!options) {
@@ -70,6 +70,9 @@ function AutocompleteFieldBySchema(_a) {
                 return option[optionLabelKey];
             }, onChange: (e, value) => {
                 field.onChange(value);
+                if (onValueChange) {
+                    onValueChange(e);
+                }
             }, fullWidth: true, renderInput: (params) => {
                 return renderInput(Object.assign(Object.assign({}, params), { control,
                     isSemaphoric,

package/dist/components/forms/inputs/EditableAutocompleteFieldBySchema.js

@@ -49,7 +49,7 @@ const DialogActions_1 = __importDefault(require("../../DialogActions"));
 const APIWrapperContext_1 = require("../../../context/APIWrapperContext");
 const filter = (0, Autocomplete_1.createFilterOptions)();
 const EditableAutocompleteFieldBySchema = react_1.default.forwardRef((_a, ref) => {
-    var { control, schema, errors, setValue, getValues, fieldKey, labelKey = 'nome', index, name = 'name', optionsAC, optionsModel, getOptionLabel, renderOption, onEditModel, sx = { mr: 2 }, multiple = false, disabled = false } = _a, other = __rest(_a, ["control", "schema", "errors", "setValue", "getValues", "fieldKey", "labelKey", "index", "name", "optionsAC", "optionsModel", "getOptionLabel", "renderOption", "onEditModel", "sx", "multiple", "disabled"]);
+    var { control, schema, errors, setValue, getValues, fieldKey, labelKey = 'nome', index, name = 'name', optionsAC, optionsModel, getOptionLabel, renderOption, onEditModel, sx = { mr: 2 }, onValueChange, multiple = false, disabled = false } = _a, other = __rest(_a, ["control", "schema", "errors", "setValue", "getValues", "fieldKey", "labelKey", "index", "name", "optionsAC", "optionsModel", "getOptionLabel", "renderOption", "onEditModel", "sx", "onValueChange", "multiple", "disabled"]);
     const { setDialog } = (0, APIWrapperContext_1.useAPIWrapper)();
     const [options, setOptions] = (0, react_1.useState)(null);
     const model = name;
@@ -132,6 +132,9 @@ const EditableAutocompleteFieldBySchema = react_1.default.forwardRef((_a, ref) =
                         }
                     }
                     field.onChange(multiple ? newValueAr : newValueAr[0]);
+                    if (onValueChange) {
+                        onValueChange(e);
+                    }
                 }, renderInput: (params) => (react_1.default.createElement(TextField_1.default, Object.assign({}, params, { label: label, required: schema[model].required, margin: "normal", error: error, helperText: helperText, InputProps: Object.assign(Object.assign({}, params.InputProps), { endAdornment: (react_1.default.createElement(react_1.default.Fragment, null,
                             !multiple && field.value && (react_1.default.createElement(IconButton_1.default, { size: "small", onClick: () => {
                                     if ((0, utils_1.isTmpId)(field.value.id)) {
@@ -209,6 +212,9 @@ const EditableAutocompleteFieldBySchema = react_1.default.forwardRef((_a, ref) =
     }
     return (react_1.default.createElement(react_hook_form_1.Controller, { control: control, name: name, render: ({ field }) => (react_1.default.createElement(Autocomplete_1.default, Object.assign({ key: name }, field, { id: name, options: options, disabled: schema[model].disabled === true || disabled === true, autoHighlight: true, isOptionEqualToValue: (option, value) => option.id === value.id, fullWidth: true, multiple: multiple, sx: sx, onChange: (e, value) => {
                 field.onChange(value);
+                if (onValueChange) {
+                    onValueChange(e);
+                }
             }, renderInput: (params) => (react_1.default.createElement(TextField_1.default, Object.assign({}, params, { label: label, required: schema[model].required, margin: "normal", error: error, helperText: helperText }, other))), getOptionLabel: getOptionLabel, renderOption: renderOption }))) }));
 });
 EditableAutocompleteFieldBySchema.displayName = 'EditableAutocompleteFieldBySchema';

package/dist/components/forms/inputs/FloatFieldBySchema.js

@@ -49,7 +49,7 @@ function FloatFieldBySchema(_a) {
     return (react_1.default.createElement(react_hook_form_1.Controller, { name: name, control: control, render: (_a) => {
             var _b = _a.field, { ref } = _b, field = __rest(_b, ["ref"]);
             const moedaInputProps = Object.assign(Object.assign({}, field), { onChange: undefined });
-            return (react_1.default.createElement(react_number_format_1.NumericFormat, Object.assign({}, moedaInputProps, other, { label: label, required: schema[model].required, onValueChange: (values, sourceInfo) => {
+            return (react_1.default.createElement(react_number_format_1.NumericFormat, Object.assign({}, moedaInputProps, other, { label: label, required: schema[model].required, onValueChange: (values) => {
                     field.onChange(values.floatValue);
                     if (onValueChange) {
                         onValueChange(values.floatValue);

package/dist/components/forms/inputs/TextFieldBySchema.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { FieldBySchemaProps } from '../../../utils';
-export default function TextFieldBySchema({ name, schema, control, errors, multiline, minRows, fieldKey, index, sx, isPassword, type, autocomplete, disabled, ...other }: FieldBySchemaProps): React.JSX.Element;
+export default function TextFieldBySchema({ name, schema, control, errors, multiline, minRows, fieldKey, index, sx, isPassword, type, autocomplete, disabled, onValueChange, ...other }: FieldBySchemaProps): React.JSX.Element;

package/dist/components/forms/inputs/TextFieldBySchema.js

@@ -19,7 +19,7 @@ const react_hook_form_1 = require("react-hook-form");
 const TextField_1 = __importDefault(require("@mui/material/TextField"));
 const utils_1 = require("../../../utils");
 function TextFieldBySchema(_a) {
-    var { name, schema, control, errors, multiline = false, minRows, fieldKey, index, sx = { mr: 2 }, isPassword = false, type, autocomplete, disabled } = _a, other = __rest(_a, ["name", "schema", "control", "errors", "multiline", "minRows", "fieldKey", "index", "sx", "isPassword", "type", "autocomplete", "disabled"]);
+    var { name, schema, control, errors, multiline = false, minRows, fieldKey, index, sx = { mr: 2 }, isPassword = false, type, autocomplete, disabled, onValueChange } = _a, other = __rest(_a, ["name", "schema", "control", "errors", "multiline", "minRows", "fieldKey", "index", "sx", "isPassword", "type", "autocomplete", "disabled", "onValueChange"]);
     const model = name;
     if (fieldKey && index && index >= 0) {
         name = `${fieldKey}.${index}.${name}`;
@@ -39,6 +39,11 @@ function TextFieldBySchema(_a) {
             error: errors && Boolean(errors[name]),
             helperText: errors && errors[name] ? errors[name].message : schema[name].help_text || '',
         };
-    return (react_1.default.createElement(react_hook_form_1.Controller, { name: name, control: control, render: ({ field }) => (react_1.default.createElement(TextField_1.default, Object.assign({}, field, other, { id: name, key: name, label: schema[model].label, required: schema[model].required, disabled: schema[model].disabled === true || disabled, margin: "normal", fullWidth: true, multiline: multiline, error: error, helperText: helperText, sx: sx, type: type, autoComplete: autocomplete, minRows: minRows }))) }));
+    return (react_1.default.createElement(react_hook_form_1.Controller, { name: name, control: control, render: ({ field }) => (react_1.default.createElement(TextField_1.default, Object.assign({}, field, other, { id: name, key: name, label: schema[model].label, required: schema[model].required, disabled: schema[model].disabled === true || disabled, onChange: (e) => {
+                field.onChange(e.target.value);
+                if (onValueChange) {
+                    onValueChange(e);
+                }
+            }, margin: "normal", fullWidth: true, multiline: multiline, error: error, helperText: helperText, sx: sx, type: type, autoComplete: autocomplete, minRows: minRows }))) }));
 }
 exports.default = TextFieldBySchema;

package/dist/context/APIWrapperContext.d.ts

@@ -69,7 +69,7 @@ export interface APIWrapperContextType {
     usuaria: Item | null;
     updateUsuaria: () => void;
     onSubmit: DRFReactBySchemaSubmitHandler;
-    loadSinglePageData: (p: LoadSinglePageDataProps) => Promise<boolean | FieldValues>;
+    loadSinglePageData: (p: LoadSinglePageDataProps) => Promise<false | Item>;
     handleLoading: (p: boolean) => void;
     optionsACState: [OptionsAC | null, (x: Partial<OptionsAC>) => void];
     pageFormState: [PageFormType | null, (x: Partial<PageFormType>) => void];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drf-react-by-schema",
-  "version": "0.15.5",
+  "version": "0.15.6",
   "description": "Components and Tools for building a React App having Django Rest Framework (DRF) as server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",