@nolwenture/formik-jsonschema-form 0.26.0 → 0.26.2

package/dist/Form.js

@@ -34,9 +34,9 @@ export const Form = (props) => {
     const schemaDefinitions = schema.definitions;
     const uiSchemaDefinitions = uiSchema.definitions;
     const registry = {
-        fields: Object.assign(Object.assign({}, defaultFields), fields),
-        templates: Object.assign(Object.assign({}, defaultTemplates), templates),
-        components: Object.assign(Object.assign({}, defaultComponents), components),
+        fields: { ...defaultFields, ...fields },
+        templates: { ...defaultTemplates, ...templates },
+        components: { ...defaultComponents, ...components },
         definitions: schemaDefinitions,
         uiSchemaDefinitions,
         formContext,

package/dist/Form.stories.js

@@ -1,23 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { action } from "@storybook/addon-actions";
 import styled from "styled-components";
@@ -44,14 +24,11 @@ const meta = {
         schema: { control: { type: "object" } },
         uiSchema: { control: { type: "object" } },
     },
-    render: (_a) => {
-        var args = __rest(_a, []);
-        return (_jsx(MockFileUploadProvider, { children: _jsx(Formik, { initialValues: {}, onSubmit: (values, formikHelpers) => __awaiter(void 0, void 0, void 0, function* () {
-                    action("onSubmit(_, formHelper)")(formikHelpers);
-                    action("onSubmit(values)")(values);
-                    formikHelpers.setSubmitting(false);
-                }), children: _jsx(Form, Object.assign({}, args)) }) }));
-    },
+    render: ({ ...args }) => (_jsx(MockFileUploadProvider, { children: _jsx(Formik, { initialValues: {}, onSubmit: async (values, formikHelpers) => {
+                action("onSubmit(_, formHelper)")(formikHelpers);
+                action("onSubmit(values)")(values);
+                formikHelpers.setSubmitting(false);
+            }, children: _jsx(Form, { ...args }) }) })),
 };
 export default meta;
 export const Simple = {
@@ -96,11 +73,11 @@ export const CompleteSchema = {
     },
 };
 export const StrictlyTyped = () => {
-    return (_jsx(Formik, { initialValues: { firstName: "", lastName: "" }, onSubmit: (values, formikHelpers) => __awaiter(void 0, void 0, void 0, function* () {
+    return (_jsx(Formik, { initialValues: { firstName: "", lastName: "" }, onSubmit: async (values, formikHelpers) => {
             action("onSubmit(_, formHelper)")(formikHelpers);
             action("onSubmit(values)")(values);
             formikHelpers.setSubmitting(false);
-        }), children: _jsx(Form, { schema: simpleSchema }) }));
+        }, children: _jsx(Form, { schema: simpleSchema }) }));
 };
 /*** CUSTOMIZATION  ***/
 const CustomizedForm = styled(Form) `
@@ -122,11 +99,11 @@ const CustomizedRequiredIndicator = styled(styledComponents.RequiredIndicator) `
   color: aqua;
 `;
 export const StylesCustomized = () => {
-    return (_jsx(Formik, { initialValues: {}, onSubmit: (values, formikHelpers) => __awaiter(void 0, void 0, void 0, function* () {
+    return (_jsx(Formik, { initialValues: {}, onSubmit: async (values, formikHelpers) => {
             action("onSubmit(_, formHelper)")(formikHelpers);
             action("onSubmit(values)")(values);
             formikHelpers.setSubmitting(false);
-        }), children: _jsx(CustomizedForm, { schema: simpleSchema, uiSchema: {
+        }, children: _jsx(CustomizedForm, { schema: simpleSchema, uiSchema: {
                 age: {
                     props: {
                         wrapper: {

package/dist/FormEditor.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { Formik } from "formik";
@@ -18,12 +9,12 @@ export const FormEditor = (props) => {
         uiSchema: {},
     });
     useEffect(() => console.log(editorGeneratedSchemas), [editorGeneratedSchemas]);
-    return (_jsxs("div", { style: { display: "flex", justifyContent: "space-between" }, children: [_jsxs("div", { children: [_jsx("h1", { children: "Editor" }), _jsx(Formik, { initialValues: { schema: {}, uiSchema: {} }, onSubmit: (values, formikHelpers) => __awaiter(void 0, void 0, void 0, function* () {
+    return (_jsxs("div", { style: { display: "flex", justifyContent: "space-between" }, children: [_jsxs("div", { children: [_jsx("h1", { children: "Editor" }), _jsx(Formik, { initialValues: { schema: {}, uiSchema: {} }, onSubmit: async (values, formikHelpers) => {
                             setEditorGeneratedSchemas(values);
                             formikHelpers.setSubmitting(false);
-                        }), children: _jsx(Form, Object.assign({}, formEditorSchemas)) })] }), _jsxs("div", { children: [_jsx("h1", { children: "Preview" }), _jsx(Formik, { initialValues: {}, onSubmit: (values, formikHelpers) => __awaiter(void 0, void 0, void 0, function* () {
+                        }, children: _jsx(Form, { ...formEditorSchemas }) })] }), _jsxs("div", { children: [_jsx("h1", { children: "Preview" }), _jsx(Formik, { initialValues: {}, onSubmit: async (values, formikHelpers) => {
                             // action("onSubmit(_, formHelper)")(formikHelpers);
                             // action("onSubmit(values)")(values);
                             formikHelpers.setSubmitting(false);
-                        }), children: _jsx(Form, Object.assign({}, editorGeneratedSchemas)) })] })] }));
+                        }, children: _jsx(Form, { ...editorGeneratedSchemas }) })] })] }));
 };

package/dist/FormPdf.js

@@ -33,9 +33,9 @@ export const FormPdf = (props) => {
     const schemaDefinitions = schema.definitions;
     const uiSchemaDefinitions = uiSchema.definitions;
     const registry = {
-        fields: Object.assign(Object.assign({}, defaultFields), fields),
-        templates: Object.assign(Object.assign({}, defaultTemplates), templates),
-        components: Object.assign(Object.assign({}, defaultComponents), components),
+        fields: { ...defaultFields, ...fields },
+        templates: { ...defaultTemplates, ...templates },
+        components: { ...defaultComponents, ...components },
         definitions: schemaDefinitions,
         uiSchemaDefinitions,
         formContext,

package/dist/FormPdf.stories.js

@@ -1,23 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { action } from "@storybook/addon-actions";
 import { Formik } from "formik";
@@ -36,14 +16,11 @@ const meta = {
         uiSchema: { control: { type: "object" } },
         values: {},
     },
-    render: (_a) => {
-        var args = __rest(_a, []);
-        return (_jsx(Formik, { initialValues: args.values, onSubmit: (values, formikHelpers) => __awaiter(void 0, void 0, void 0, function* () {
-                action("onSubmit(_, formHelper)")(formikHelpers);
-                action("onSubmit(values)")(values);
-                formikHelpers.setSubmitting(false);
-            }), children: _jsx(FormPdf, Object.assign({}, args)) }));
-    },
+    render: ({ ...args }) => (_jsx(Formik, { initialValues: args.values, onSubmit: async (values, formikHelpers) => {
+            action("onSubmit(_, formHelper)")(formikHelpers);
+            action("onSubmit(values)")(values);
+            formikHelpers.setSubmitting(false);
+        }, children: _jsx(FormPdf, { ...args }) })),
 };
 export default meta;
 export const SimplePdf = {
@@ -106,11 +83,11 @@ const CustomizedStringFieldPdf = styled(StringFieldPdf) `
   color: purple;
 `;
 export const StylesCustomized = () => {
-    return (_jsx(Formik, { initialValues: { firstName: "Doro", lastName: "Heck", age: 31 }, onSubmit: (values, formikHelpers) => __awaiter(void 0, void 0, void 0, function* () {
+    return (_jsx(Formik, { initialValues: { firstName: "Doro", lastName: "Heck", age: 31 }, onSubmit: async (values, formikHelpers) => {
             action("onSubmit(_, formHelper)")(formikHelpers);
             action("onSubmit(values)")(values);
             formikHelpers.setSubmitting(false);
-        }), children: _jsx(CustomizedForm, { schema: simpleSchema, uiSchema: {
+        }, children: _jsx(CustomizedForm, { schema: simpleSchema, uiSchema: {
                 age: {
                     props: {
                         wrapper: {

package/dist/fields/AnyField.js

@@ -11,11 +11,11 @@ export const AnyField = (props) => {
     const enrichedSchema = useMemo(() => {
         switch (type) {
             case "object":
-                return Object.assign(Object.assign({}, (schema || {})), { type, additionalProperties: {} });
+                return { ...(schema || {}), type, additionalProperties: {} };
             case "array":
-                return Object.assign(Object.assign({}, (schema || {})), { type, additionalItems: {} });
+                return { ...(schema || {}), type, additionalItems: {} };
             default:
-                return Object.assign(Object.assign({}, (schema || {})), { type });
+                return { ...(schema || {}), type };
         }
     }, [type, schema]);
     return (_jsxs("div", { children: [_jsx("select", { value: type, onChange: (event) => setType(event.target.value), children: Object.keys(COMPONENT_TYPES).map((type) => (_jsx("option", { value: type, children: type }, type))) }), _jsx(SchemaField, { name: name, schema: enrichedSchema, uiSchema: uiSchema })] }));

package/dist/fields/ArrayField.js

@@ -31,7 +31,6 @@ const moveInArray = (values, index, direction) => {
     }
 };
 export const ArrayField = (props) => {
-    var _a, _b, _c, _d;
     const { fields: { SchemaField }, templates: { ArrayFieldTemplate }, components: { ArrayFieldItem, ArrayFieldList, ArrayFieldItemButtons, ArrayFieldAddButton, ArrayFieldRemoveButton, ArrayFieldUpButton, ArrayFieldDownButton, }, useItemsAsAdditionalItems, } = useContext(FormRegistry);
     useSetDefault(props);
     const { name, schema, uiSchema } = props;
@@ -98,14 +97,15 @@ export const ArrayField = (props) => {
     // Backwards compatibility ends
     const { disabled } = useExtractUiSchema(uiSchema);
     const valueArray = Array.isArray(value) ? value : undefined;
-    return schema.anyOf !== undefined ? (_jsx(FieldTemplate, Object.assign({}, props, { "data-fjsf-array": name, children: _jsx(FieldInput, Object.assign({ type }, inputProps, { name: name, formikAs: "select", multiple: (enums === null || enums === void 0 ? void 0 : enums.type) === "multiSelect", children: enums === null || enums === void 0 ? void 0 : enums.values.map((option, index) => (_jsx("option", { value: option.const, children: option.title }, index))) })) }))) : (_jsxs(ArrayFieldTemplate, Object.assign({}, props, { "data-fjsf-array": name, children: [_jsxs(ArrayFieldList, { children: [(items || []).map((itemSchema, index) => (_jsx(ArrayFieldItem, { children: _jsx(SchemaField, { name: `${name}[${index}]`, schema: typeof itemSchema !== "boolean" ? itemSchema : {}, uiSchema: (uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema[index]) || (uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema.items), 
+    return schema.anyOf !== undefined ? (_jsx(FieldTemplate, { ...props, "data-fjsf-array": name, children: _jsx(FieldInput, { type,
+            ...inputProps, name: name, formikAs: "select", multiple: enums?.type === "multiSelect", children: enums?.values.map((option, index) => (_jsx("option", { value: option.const, children: option.title }, index))) }) })) : (_jsxs(ArrayFieldTemplate, { ...props, "data-fjsf-array": name, children: [_jsxs(ArrayFieldList, { children: [(items || []).map((itemSchema, index) => (_jsx(ArrayFieldItem, { children: _jsx(SchemaField, { name: `${name}[${index}]`, schema: typeof itemSchema !== "boolean" ? itemSchema : {}, uiSchema: uiSchema?.[index] || uiSchema?.items, 
                             // "true" will prevent validation for required array fields
                             // since a value always exists in the array
-                            forceDefaultValue: false }) }, index))), ((valueArray === null || valueArray === void 0 ? void 0 : valueArray.slice(items.length)) || []).map((_, index) => {
-                        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-                        return (_jsxs(ArrayFieldItem, { children: [_jsx(SchemaField, { name: `${name}[${index + items.length}]`, schema: additionalItems && typeof additionalItems !== "boolean"
-                                        ? additionalItems
-                                        : {}, uiSchema: Object.assign({ disabled }, ((uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema[index + items.length]) || (uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema.items))) }), _jsxs(ArrayFieldItemButtons, { children: [_jsx(ArrayFieldRemoveButton, Object.assign({}, ((_b = (_a = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:removeButtonOptions"]) === null || _a === void 0 ? void 0 : _a.props) !== null && _b !== void 0 ? _b : {}), { onClick: () => setValue(removeFromArray(value, index + items.length)), children: (_d = (_c = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:removeButtonOptions"]) === null || _c === void 0 ? void 0 : _c.content) !== null && _d !== void 0 ? _d : "-" })), value.length > 1 && index > 0 && (_jsx(ArrayFieldUpButton, Object.assign({}, ((_f = (_e = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:upButtonOptions"]) === null || _e === void 0 ? void 0 : _e.props) !== null && _f !== void 0 ? _f : {}), { onClick: () => setValue(moveInArray(value, index + items.length, -1)), children: (_h = (_g = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:upButtonOptions"]) === null || _g === void 0 ? void 0 : _g.content) !== null && _h !== void 0 ? _h : "↑" }))), value.length > 1 &&
-                                            index < (value === null || value === void 0 ? void 0 : value.slice(items.length).length) - 1 && (_jsx(ArrayFieldDownButton, Object.assign({}, ((_k = (_j = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:downButtonOptions"]) === null || _j === void 0 ? void 0 : _j.props) !== null && _k !== void 0 ? _k : {}), { onClick: () => setValue(moveInArray(value, index + items.length, 1)), children: (_m = (_l = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:downButtonOptions"]) === null || _l === void 0 ? void 0 : _l.content) !== null && _m !== void 0 ? _m : "↓" })))] })] }, index));
-                    })] }), additionalItems && (_jsx(ArrayFieldAddButton, Object.assign({}, ((_b = (_a = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:addButtonOptions"]) === null || _a === void 0 ? void 0 : _a.props) !== null && _b !== void 0 ? _b : {}), { onClick: () => setValue(appendArray(value)), children: (_d = (_c = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:addButtonOptions"]) === null || _c === void 0 ? void 0 : _c.content) !== null && _d !== void 0 ? _d : "+" })))] })));
+                            forceDefaultValue: false }) }, index))), (valueArray?.slice(items.length) || []).map((_, index) => (_jsxs(ArrayFieldItem, { children: [_jsx(SchemaField, { name: `${name}[${index + items.length}]`, schema: additionalItems && typeof additionalItems !== "boolean"
+                                    ? additionalItems
+                                    : {}, uiSchema: {
+                                    disabled,
+                                    ...(uiSchema?.[index + items.length] || uiSchema?.items),
+                                } }), _jsxs(ArrayFieldItemButtons, { children: [_jsx(ArrayFieldRemoveButton, { ...(uiSchema?.["ui:removeButtonOptions"]?.props ?? {}), onClick: () => setValue(removeFromArray(value, index + items.length)), children: uiSchema?.["ui:removeButtonOptions"]?.content ?? "-" }), value.length > 1 && index > 0 && (_jsx(ArrayFieldUpButton, { ...(uiSchema?.["ui:upButtonOptions"]?.props ?? {}), onClick: () => setValue(moveInArray(value, index + items.length, -1)), children: uiSchema?.["ui:upButtonOptions"]?.content ?? "↑" })), value.length > 1 &&
+                                        index < value?.slice(items.length).length - 1 && (_jsx(ArrayFieldDownButton, { ...(uiSchema?.["ui:downButtonOptions"]?.props ?? {}), onClick: () => setValue(moveInArray(value, index + items.length, 1)), children: uiSchema?.["ui:downButtonOptions"]?.content ?? "↓" }))] })] }, index)))] }), additionalItems && (_jsx(ArrayFieldAddButton, { ...(uiSchema?.["ui:addButtonOptions"]?.props ?? {}), onClick: () => setValue(appendArray(value)), children: uiSchema?.["ui:addButtonOptions"]?.content ?? "+" }))] }));
 };

package/dist/fields/BooleanField.js

@@ -9,7 +9,10 @@ export const BooleanField = (props) => {
     const { name, uiSchema } = props;
     const { label, props: inputProps } = useExtractUiSchema(uiSchema);
     const { values, setValues } = useFormikContext();
-    return (_jsx(FieldTemplate, Object.assign({}, props, { "data-fjsf-boolean": name, children: _jsxs(BooleanFieldWrapper, { children: [_jsx(FieldInput, Object.assign({}, inputProps, { name: name, type: "checkbox" })), _jsx("span", { onClick: () => {
-                        setValues(Object.assign(Object.assign({}, values), { [name]: !(values === null || values === void 0 ? void 0 : values[name]) }));
-                    }, children: label })] }) })));
+    return (_jsx(FieldTemplate, { ...props, "data-fjsf-boolean": name, children: _jsxs(BooleanFieldWrapper, { children: [_jsx(FieldInput, { ...inputProps, name: name, type: "checkbox" }), _jsx("span", { onClick: () => {
+                        setValues({
+                            ...values,
+                            [name]: !values?.[name],
+                        });
+                    }, children: label })] }) }));
 };

package/dist/fields/DateField.js

@@ -7,5 +7,5 @@ export const DateField = (props) => {
     useSetDefault(props);
     const { name, uiSchema } = props;
     const { props: inputProps } = useExtractUiSchema(uiSchema);
-    return (_jsx(FieldTemplate, Object.assign({}, props, { "data-fjsf-string": name, children: _jsx(FieldInput, Object.assign({}, inputProps, { name: name, type: "date" })) })));
+    return (_jsx(FieldTemplate, { ...props, "data-fjsf-string": name, children: _jsx(FieldInput, { ...inputProps, name: name, type: "date" }) }));
 };

package/dist/fields/FileUploadField.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useEffect, useState } from "react";
 import { FormRegistry } from "../Form";
@@ -23,10 +14,10 @@ export const FileUploadField = (props) => {
     const { uploadFile, fetchFile, removeFile } = useContext(FileUploadContext);
     const [uploadedFile, setUploadedFile] = useState(null);
     useEffect(() => {
-        (() => __awaiter(void 0, void 0, void 0, function* () { return setUploadedFile(yield fetchFile(value)); }))();
+        (async () => setUploadedFile(await fetchFile(value)))();
     }, [value]);
     const [uploadProgress, setUploadProgress] = useState(0);
-    const handleFileUpload = (file, setFieldValue) => __awaiter(void 0, void 0, void 0, function* () {
+    const handleFileUpload = async (file, setFieldValue) => {
         const formData = new FormData();
         formData.append("file", file);
         try {
@@ -41,7 +32,7 @@ export const FileUploadField = (props) => {
                     clearInterval(interval);
                 }
             }, 100);
-            const result = yield uploadFile({
+            const result = await uploadFile({
                 data: formData,
                 onUploadProgress: (progressEvent) => {
                     const totalLength = progressEvent.total;
@@ -58,13 +49,13 @@ export const FileUploadField = (props) => {
         catch (error) {
             console.error("File upload failed", error);
         }
-    });
-    const handleRemoveFile = (setFieldValue) => __awaiter(void 0, void 0, void 0, function* () {
-        if (uploadedFile === null || uploadedFile === void 0 ? void 0 : uploadedFile.name) {
-            yield removeFile(uploadedFile.name);
+    };
+    const handleRemoveFile = async (setFieldValue) => {
+        if (uploadedFile?.name) {
+            await removeFile(uploadedFile.name);
             setUploadProgress(0);
             setFieldValue(name, null);
         }
-    });
-    return (_jsx(FieldTemplate, Object.assign({}, props, { "data-fjsf-object": name, children: _jsx(FileUploadField, Object.assign({}, inputProps, { name: name, value: value, handleRemoveFile: handleRemoveFile, uploadedFile: uploadedFile, setFieldValue: setFieldValue, handleFileUpload: handleFileUpload, uploadProgress: uploadProgress, removeButton: uiSchema["ui:removeButton"], uploadButtonText: uiSchema["ui:uploadButtonText"], infoText: uiSchema["ui:infoText"], hideRemoveButton: inputProps === null || inputProps === void 0 ? void 0 : inputProps.removeButton.hidden })) })));
+    };
+    return (_jsx(FieldTemplate, { ...props, "data-fjsf-object": name, children: _jsx(FileUploadField, { ...inputProps, name: name, value: value, handleRemoveFile: handleRemoveFile, uploadedFile: uploadedFile, setFieldValue: setFieldValue, handleFileUpload: handleFileUpload, uploadProgress: uploadProgress, removeButton: uiSchema["ui:removeButton"], uploadButtonText: uiSchema["ui:uploadButtonText"], infoText: uiSchema["ui:infoText"], hideRemoveButton: inputProps?.removeButton.hidden }) }));
 };

package/dist/fields/MultipleChoiceField.js

@@ -14,7 +14,7 @@ export const MultipleChoiceField = (props) => {
     const value = getIn(values, name);
     const form = useFormikContext();
     const fieldDataAttribute = (() => {
-        switch (schema === null || schema === void 0 ? void 0 : schema.type) {
+        switch (schema?.type) {
             case "array":
                 return { "data-fjsf-array": name };
             case "number":
@@ -24,5 +24,5 @@ export const MultipleChoiceField = (props) => {
                 return { "data-fjsf-string": name };
         }
     })();
-    return (_jsx(FieldTemplate, Object.assign({}, props, fieldDataAttribute, { children: _jsx(MultipleChoiceField, { inputProps: inputProps, name: name, enums: enums, style: style, value: value, form: form }) })));
+    return (_jsx(FieldTemplate, { ...props, ...fieldDataAttribute, children: _jsx(MultipleChoiceField, { inputProps: inputProps, name: name, enums: enums, style: style, value: value, form: form }) }));
 };

package/dist/fields/NullField.js

@@ -4,5 +4,5 @@ import { FormRegistry } from "../Form";
 export const NullField = (props) => {
     const { templates: { FieldTemplate }, } = useContext(FormRegistry);
     const { name, uiSchema } = props;
-    return _jsx(FieldTemplate, Object.assign({}, props, { "data-fjsf-null": name }));
+    return _jsx(FieldTemplate, { ...props, "data-fjsf-null": name });
 };

package/dist/fields/NumberField.js

@@ -1,6 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { StringField } from "./StringField";
 export const NumberField = (props) => {
-    var _a;
-    return (_jsx(StringField, Object.assign({}, props, { uiSchema: Object.assign(Object.assign({}, props.uiSchema), { "ui:props": Object.assign(Object.assign({}, (((_a = props.uiSchema) === null || _a === void 0 ? void 0 : _a["ui:props"]) || {})), { type: "number" }) }) })));
+    return (_jsx(StringField, { ...props, uiSchema: {
+            ...props.uiSchema,
+            "ui:props": { ...(props.uiSchema?.["ui:props"] || {}), type: "number" },
+        } }));
 };

package/dist/fields/ObjectField.js

@@ -1,14 +1,3 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useField, useFormikContext } from "formik";
 import { useContext, useEffect, useMemo } from "react";
@@ -27,7 +16,6 @@ const useObjectField = (name) => {
     return { value, setValue };
 };
 export const ObjectField = (props) => {
-    var _a, _b;
     const { fields: { SchemaField }, templates: { ObjectFieldTemplate, CollapsibleObjectFieldTemplate }, components: { ObjectFieldItem, ObjectFieldItemButtons }, hideUnmarkedAdditionalProperties, } = useContext(FormRegistry);
     useSetDefault(props);
     const { name, schema, uiSchema } = props;
@@ -38,7 +26,7 @@ export const ObjectField = (props) => {
     useEffect(() => {
         if (valuesToRemove.length > 0) {
             const newValue = valuesToRemove.reduce((prevValue, key) => {
-                const _a = prevValue, _b = key, _removedProperty = _a[_b], newValue = __rest(_a, [typeof _b === "symbol" ? _b : _b + ""]);
+                const { [key]: _removedProperty, ...newValue } = prevValue;
                 return newValue;
             }, value);
             setValue(newValue);
@@ -46,24 +34,24 @@ export const ObjectField = (props) => {
     }, [valuesToRemove]);
     const propertyKeys = useMemo(() => Object.keys(properties || {}), [properties]);
     const additionalValues = useMemo(() => Object.fromEntries(Object.entries(value || {}).filter(([key, value]) => !propertyKeys.includes(key))), [value, propertyKeys]);
-    const FieldTemplateComponent = ((_b = (_a = props.uiSchema) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.isCollapsible)
+    const FieldTemplateComponent = props.uiSchema?.props?.isCollapsible
         ? CollapsibleObjectFieldTemplate
         : ObjectFieldTemplate;
-    const orderedProperties = orderByUiSchema(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema["ui:order"], Object.keys(properties || {}));
-    return (_jsxs(FieldTemplateComponent, Object.assign({}, props, { "data-fjsf-object": name, children: [(orderedProperties !== null && orderedProperties !== void 0 ? orderedProperties : Object.keys(properties || {}))
+    const orderedProperties = orderByUiSchema(uiSchema?.["ui:order"], Object.keys(properties || {}));
+    return (_jsxs(FieldTemplateComponent, { ...props, "data-fjsf-object": name, children: [(orderedProperties ?? Object.keys(properties || {}))
                 .map((childName) => {
-                const childSchema = properties === null || properties === void 0 ? void 0 : properties[childName];
+                const childSchema = properties?.[childName];
                 if (!childSchema)
                     return undefined;
-                return (_jsx(SchemaField, { required: required === null || required === void 0 ? void 0 : required.includes(childName), name: name ? [name, childName].join(".") : childName, schema: typeof childSchema !== "boolean" ? childSchema : {}, uiSchema: uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema[childName] }, childName));
+                return (_jsx(SchemaField, { required: required?.includes(childName), name: name ? [name, childName].join(".") : childName, schema: typeof childSchema !== "boolean" ? childSchema : {}, uiSchema: uiSchema?.[childName] }, childName));
             })
                 .filter((x) => x), (!hideUnmarkedAdditionalProperties || additionalProperties) &&
-                Object.entries(additionalValues || {}).map(([childName]) => (_jsxs(ObjectFieldItem, { children: [_jsx(SchemaField, { required: required === null || required === void 0 ? void 0 : required.includes(childName), name: name ? [name, childName].join(".") : childName, schema: typeof schema.additionalProperties !== "boolean"
+                Object.entries(additionalValues || {}).map(([childName]) => (_jsxs(ObjectFieldItem, { children: [_jsx(SchemaField, { required: required?.includes(childName), name: name ? [name, childName].join(".") : childName, schema: typeof schema.additionalProperties !== "boolean"
                                 ? schema.additionalProperties
-                                : {}, uiSchema: uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema[childName] }, childName), _jsx(ObjectFieldItemButtons, { children: getObjectFieldButton({
+                                : {}, uiSchema: uiSchema?.[childName] }, childName), _jsx(ObjectFieldItemButtons, { children: getObjectFieldButton({
                                 purpose: ObjectFieldButtonPurpose.REMOVE,
                                 onClick: () => {
-                                    const _a = value, _b = childName, _removedProperty = _a[_b], newValue = __rest(_a, [typeof _b === "symbol" ? _b : _b + ""]);
+                                    const { [childName]: _removedProperty, ...newValue } = value;
                                     setValue(newValue);
                                 },
                                 uiSchema: uiSchema,
@@ -73,9 +61,9 @@ export const ObjectField = (props) => {
                     onClick: () => {
                         const key = prompt("Give key");
                         if (key) {
-                            setValue(Object.assign(Object.assign({}, value), { [key]: undefined }));
+                            setValue({ ...value, [key]: undefined });
                         }
                     },
                     uiSchema: uiSchema,
-                })] })));
+                })] }));
 };

package/dist/fields/RadioField.js

@@ -7,5 +7,5 @@ export const RadioField = (props) => {
     useSetDefault(props);
     const { name, uiSchema } = props;
     const { label, props: inputProps } = useExtractUiSchema(uiSchema);
-    return (_jsx(FieldTemplate, Object.assign({}, props, { "data-fjsf-boolean": name, children: _jsx(RadioButtonField, { inputProps: inputProps, label: label, name: name }) })));
+    return (_jsx(FieldTemplate, { ...props, "data-fjsf-boolean": name, children: _jsx(RadioButtonField, { inputProps: inputProps, label: label, name: name }) }));
 };

package/dist/fields/SchemaField.js

@@ -26,6 +26,10 @@ export const SchemaField = (props) => {
     const { fields, definitions, uiSchemaDefinitions } = useContext(FormRegistry);
     const schemaSolvedForReferences = useMemo(() => solveReferences(schema, definitions, uiSchema, uiSchemaDefinitions), [schema, definitions]);
     const FieldComponent = useFieldComponent(schemaSolvedForReferences.schema, schemaSolvedForReferences.uiSchema, fields);
-    const newProps = Object.assign(Object.assign({}, props), { schema: schemaSolvedForReferences.schema, uiSchema: schemaSolvedForReferences.uiSchema });
-    return _jsx(FieldComponent, Object.assign({}, newProps));
+    const newProps = {
+        ...props,
+        schema: schemaSolvedForReferences.schema,
+        uiSchema: schemaSolvedForReferences.uiSchema,
+    };
+    return _jsx(FieldComponent, { ...newProps });
 };

package/dist/fields/SearchMultiTagSelectField.js

@@ -10,5 +10,5 @@ export const SearchMultiTagSelectField = (props) => {
     const { name, uiSchema } = props;
     const { placeholder, emptySearchMessage, props: inputProps, } = useExtractUiSchema(uiSchema);
     const enums = useMemo(() => getEnums(props), [props]);
-    return (_jsx(FieldTemplate, Object.assign({}, props, { "data-fjsf-array": name, children: _jsx(SearchableMultiTagSelectField, Object.assign({}, inputProps, { name: name, placeholder: placeholder, emptySearchMessage: emptySearchMessage, enums: enums })) })));
+    return (_jsx(FieldTemplate, { ...props, "data-fjsf-array": name, children: _jsx(SearchableMultiTagSelectField, { ...inputProps, name: name, placeholder: placeholder, emptySearchMessage: emptySearchMessage, enums: enums }) }));
 };

package/dist/fields/SearchableSelectField.js

@@ -1,14 +1,3 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext, useEffect, useMemo, useRef, useState, } from "react";
 import { useField } from "formik";
@@ -19,7 +8,7 @@ export const SearchableSelectField = (props) => {
     const { templates: { FieldTemplate }, components: { SearchableSelectContainer, SearchDropdownContainer, SearchListOption, SearchListExpand, SearchNotFound, SearchInput, SearchClearButton, SearchInputContainer, }, } = useContext(FormRegistry);
     useSetDefault(props);
     const ListOption = (props) => {
-        const { isActive, children } = props, rest = __rest(props, ["isActive", "children"]);
+        const { isActive, children, ...rest } = props;
         const ref = useRef();
         useEffect(() => {
             if (isActive) {
@@ -30,16 +19,22 @@ export const SearchableSelectField = (props) => {
                 });
             }
         }, [isActive]);
-        return (_jsx(SearchListOption, Object.assign({ ref: ref }, rest, { children: children })));
+        return (_jsx(SearchListOption, { ref: ref, ...rest, children: children }));
     };
     const { name, uiSchema, schema, onChange, onSelect } = props;
     const { props: inputProps, placeholder, clearButtonText, expandText, notFoundMessage, hoverColors = { backgroundColor: "", color: "" }, hideClearButton = false, dropdown, } = useExtractUiSchema(uiSchema);
-    const dropdownOptions = Object.assign({ show: false, height: "", width: "", perPage: 20 }, dropdown);
+    const dropdownOptions = {
+        show: false,
+        height: "",
+        width: "",
+        perPage: 20,
+        ...dropdown,
+    };
     const [{ value }, __, { setValue }] = useField(name);
     const enums = useMemo(() => getEnums(props), [props]);
-    const options = (enums === null || enums === void 0 ? void 0 : enums.values) || [];
-    const [showOptions, setShowOptions] = useState(dropdownOptions === null || dropdownOptions === void 0 ? void 0 : dropdownOptions.show);
-    const [searchTerm, setSearchTerm] = useState(() => { var _a, _b; return (_b = (_a = options.find((option) => option.const === value)) === null || _a === void 0 ? void 0 : _a.title) !== null && _b !== void 0 ? _b : ""; });
+    const options = enums?.values || [];
+    const [showOptions, setShowOptions] = useState(dropdownOptions?.show);
+    const [searchTerm, setSearchTerm] = useState(() => options.find((option) => option.const === value)?.title ?? "");
     const [displayedItems, setDisplayedItems] = useState([]);
     const [itemsToShow, setItemsToShow] = useState(dropdownOptions.perPage);
     const [selectedItemIndex, setSelectedItemIndex] = useState(-1);
@@ -50,7 +45,7 @@ export const SearchableSelectField = (props) => {
     };
     useEffect(() => {
         setDisplayedItems(options
-            .filter((option) => { var _a, _b; return ((_b = (_a = option.title) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : "").includes(searchTerm.toLowerCase()); })
+            .filter((option) => (option.title?.toLowerCase() ?? "").includes(searchTerm.toLowerCase()))
             .slice(0, itemsToShow));
     }, [itemsToShow, options, searchTerm]);
     const handleKeyPress = (event) => {
@@ -94,14 +89,13 @@ export const SearchableSelectField = (props) => {
         setItemsToShow(dropdownOptions.perPage);
         setShowOptions(true);
         setSelectedItemIndex(-1);
-        onChange === null || onChange === void 0 ? void 0 : onChange(event);
+        onChange?.(event);
     };
     const handleSelect = (item) => {
-        var _a;
-        setSearchTerm((_a = item.title) !== null && _a !== void 0 ? _a : "");
+        setSearchTerm(item.title ?? "");
         setValue(item.const);
         setShowOptions(false);
-        onSelect === null || onSelect === void 0 ? void 0 : onSelect(item.const);
+        onSelect?.(item.const);
     };
     const handleFocus = () => {
         setShowOptions(true);
@@ -116,13 +110,13 @@ export const SearchableSelectField = (props) => {
         setSearchTerm("");
         setValue(undefined);
     };
-    const filteredOptions = options.filter((option) => { var _a, _b; return ((_b = (_a = option.title) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : "").includes(searchTerm.toLowerCase()); });
+    const filteredOptions = options.filter((option) => (option.title?.toLowerCase() ?? "").includes(searchTerm.toLowerCase()));
     const showMoreOption = displayedItems.length < filteredOptions.length &&
         displayedItems.length >= dropdownOptions.perPage;
     const fieldDataAttribute = schema.type === "string"
         ? { "data-fjsf-string": name }
         : { "data-fjsf-number": name };
-    return (_jsx(FieldTemplate, Object.assign({}, props, fieldDataAttribute, { children: _jsxs(SearchableSelectContainer, { ref: containerRef, onBlur: handleBlur, children: [_jsxs(SearchInputContainer, { children: [_jsx(SearchInput, Object.assign({}, inputProps, { name: name, type: "text", placeholder: placeholder, value: searchTerm, onChange: handleSearchChange, onFocus: handleFocus })), searchTerm && !hideClearButton && (_jsx(SearchClearButton, { onClick: handleClear, children: clearButtonText !== null && clearButtonText !== void 0 ? clearButtonText : "x" }))] }), showOptions && (_jsxs(SearchDropdownContainer, { role: "dropdown-list", ref: moreRef, style: {
+    return (_jsx(FieldTemplate, { ...props, ...fieldDataAttribute, children: _jsxs(SearchableSelectContainer, { ref: containerRef, onBlur: handleBlur, children: [_jsxs(SearchInputContainer, { children: [_jsx(SearchInput, { ...inputProps, name: name, type: "text", placeholder: placeholder, value: searchTerm, onChange: handleSearchChange, onFocus: handleFocus }), searchTerm && !hideClearButton && (_jsx(SearchClearButton, { onClick: handleClear, children: clearButtonText ?? "x" }))] }), showOptions && (_jsxs(SearchDropdownContainer, { role: "dropdown-list", ref: moreRef, style: {
                         maxHeight: dropdownOptions.height,
                         width: dropdownOptions.width,
                     }, children: [displayedItems.length > 0 ? (displayedItems.map((item, index) => (_jsx(ListOption, { isActive: index === selectedItemIndex, className: index === selectedItemIndex ? "selected-item-active" : "", style: index === selectedItemIndex
@@ -130,5 +124,5 @@ export const SearchableSelectField = (props) => {
                                     backgroundColor: hoverColors.backgroundColor,
                                     color: hoverColors.color,
                                 }
-                                : {}, role: "filtered-list", onClick: () => handleSelect(item), onMouseDown: (e) => e.preventDefault(), children: item.title }, index)))) : (_jsx(SearchNotFound, { onMouseDown: (e) => e.preventDefault(), children: notFoundMessage !== null && notFoundMessage !== void 0 ? notFoundMessage : "No match found" })), showMoreOption && (_jsx(SearchListExpand, { ref: moreRef, onMouseDown: (e) => e.preventDefault(), onClick: loadMoreItems, children: expandText !== null && expandText !== void 0 ? expandText : "More..." }))] }))] }) })));
+                                : {}, role: "filtered-list", onClick: () => handleSelect(item), onMouseDown: (e) => e.preventDefault(), children: item.title }, index)))) : (_jsx(SearchNotFound, { onMouseDown: (e) => e.preventDefault(), children: notFoundMessage ?? "No match found" })), showMoreOption && (_jsx(SearchListExpand, { ref: moreRef, onMouseDown: (e) => e.preventDefault(), onClick: loadMoreItems, children: expandText ?? "More..." }))] }))] }) }));
 };