@uxf/cms 6.0.0-beta.3 → 6.0.0-beta.5

package/forms/ForgottenPasswordForm/ForgottenPasswordForm.js

@@ -58,24 +58,22 @@ var __read = (this && this.__read) || function (o, n) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForgottenPasswordForm = void 0;
+var form_1 = require("@uxf/form/form");
+var text_input_1 = require("@uxf/form/text-input");
+var button_1 = require("@uxf/ui/button");
 var react_1 = __importStar(require("react"));
-var Button_1 = require("../../ui/Button");
-var TextInput_1 = require("../components/TextInput");
-var react_final_form_1 = require("react-final-form");
-// TODO: email validation
+var text_link_1 = require("@uxf/ui/text-link");
 var ForgottenPasswordForm = function (props) {
     var onLogin = props.onLogin, formProps = __rest(props, ["onLogin"]);
     var _a = __read((0, react_1.useState)(true), 2), formDisabled = _a[0], setFormDisabled = _a[1];
     (0, react_1.useEffect)(function () {
         setFormDisabled(false);
     }, []);
-    return (react_1.default.createElement(react_final_form_1.Form, __assign({}, formProps), function (_a) {
-        var handleSubmit = _a.handleSubmit, submitting = _a.submitting;
-        return (react_1.default.createElement("form", { onSubmit: handleSubmit },
-            react_1.default.createElement(TextInput_1.TextInput, { disabled: formDisabled, label: "E-mail", name: "username", required: true, type: "text" }),
-            react_1.default.createElement(Button_1.Button, { color: "primary", disabled: submitting, fullWidth: true, loading: submitting, type: "submit", variant: "contained", mt: 2 }, "Obnovit heslo"),
-            onLogin && (react_1.default.createElement(Button_1.Button, { size: "small", onClick: onLogin, disabled: submitting, fullWidth: true, mt: 2 }, "P\u0159ihl\u00E1sit"))));
-    }));
+    return (react_1.default.createElement(form_1.Form, __assign({}, formProps), function (control, formApi) { return (react_1.default.createElement("div", { className: "space-y-6" },
+        react_1.default.createElement(text_input_1.TextInput, { control: control, isDisabled: formDisabled, label: "E-mail", name: "username", isRequired: true, type: "text" }),
+        react_1.default.createElement(button_1.Button, { disabled: formDisabled || formApi.formState.isSubmitting, loading: formApi.formState.isSubmitting, type: "submit", isFullWidth: true }, "Obnovit heslo"),
+        onLogin && (react_1.default.createElement("div", { className: "text-right" },
+            react_1.default.createElement(text_link_1.TextLink, { onClick: onLogin, disabled: formApi.formState.isSubmitting, className: "uxf-typo-medium2 text-primary" }, "P\u0159ihl\u00E1sit"))))); }));
 };
 exports.ForgottenPasswordForm = ForgottenPasswordForm;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRm9yZ290dGVuUGFzc3dvcmRGb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2Zvcm1zL0ZvcmdvdHRlblBhc3N3b3JkRm9ybS9Gb3Jnb3R0ZW5QYXNzd29yZEZvcm0udHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUFtRDtBQUNuRCwwQ0FBeUM7QUFDekMscURBQW9EO0FBQ3BELHFEQUF3QztBQUd4Qyx5QkFBeUI7QUFFbEIsSUFBTSxxQkFBcUIsR0FBeUMsVUFBQyxLQUFLO0lBQ3JFLElBQUEsT0FBTyxHQUFtQixLQUFLLFFBQXhCLEVBQUssU0FBUyxVQUFLLEtBQUssRUFBakMsV0FBeUIsQ0FBRixDQUFXO0lBRWxDLElBQUEsS0FBQSxPQUFrQyxJQUFBLGdCQUFRLEVBQUMsSUFBSSxDQUFDLElBQUEsRUFBL0MsWUFBWSxRQUFBLEVBQUUsZUFBZSxRQUFrQixDQUFDO0lBRXZELElBQUEsaUJBQVMsRUFBQztRQUNOLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMzQixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFUCxPQUFPLENBQ0gsOEJBQUMsdUJBQUksZUFBSyxTQUFTLEdBQ2QsVUFBQyxFQUE0QjtZQUExQixZQUFZLGtCQUFBLEVBQUUsVUFBVSxnQkFBQTtRQUFPLE9BQUEsQ0FDL0Isd0NBQU0sUUFBUSxFQUFFLFlBQVk7WUFDeEIsOEJBQUMscUJBQVMsSUFBQyxRQUFRLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBQyxRQUFRLEVBQUMsSUFBSSxFQUFDLFVBQVUsRUFBQyxRQUFRLFFBQUMsSUFBSSxFQUFDLE1BQU0sR0FBRztZQUN6Riw4QkFBQyxlQUFNLElBQ0gsS0FBSyxFQUFDLFNBQVMsRUFDZixRQUFRLEVBQUUsVUFBVSxFQUNwQixTQUFTLFFBQ1QsT0FBTyxFQUFFLFVBQVUsRUFDbkIsSUFBSSxFQUFDLFFBQVEsRUFDYixPQUFPLEVBQUMsV0FBVyxFQUNuQixFQUFFLEVBQUUsQ0FBQyxvQkFHQTtZQUNSLE9BQU8sSUFBSSxDQUNSLDhCQUFDLGVBQU0sSUFBQyxJQUFJLEVBQUMsT0FBTyxFQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxTQUFTLFFBQUMsRUFBRSxFQUFFLENBQUMsMEJBRW5FLENBQ1osQ0FDRSxDQUNWO0lBcEJrQyxDQW9CbEMsQ0FDRSxDQUNWLENBQUM7QUFDTixDQUFDLENBQUM7QUFsQ1csUUFBQSxxQkFBcUIseUJBa0NoQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRm9yZ290dGVuUGFzc3dvcmRGb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2Zvcm1zL0ZvcmdvdHRlblBhc3N3b3JkRm9ybS9Gb3Jnb3R0ZW5QYXNzd29yZEZvcm0udHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHVDQUFzQztBQUN0QyxtREFBaUQ7QUFDakQseUNBQXdDO0FBQ3hDLDZDQUFtRDtBQUVuRCwrQ0FBNkM7QUFFdEMsSUFBTSxxQkFBcUIsR0FBeUMsVUFBQyxLQUFLO0lBQ3JFLElBQUEsT0FBTyxHQUFtQixLQUFLLFFBQXhCLEVBQUssU0FBUyxVQUFLLEtBQUssRUFBakMsV0FBeUIsQ0FBRixDQUFXO0lBRWxDLElBQUEsS0FBQSxPQUFrQyxJQUFBLGdCQUFRLEVBQUMsSUFBSSxDQUFDLElBQUEsRUFBL0MsWUFBWSxRQUFBLEVBQUUsZUFBZSxRQUFrQixDQUFDO0lBRXZELElBQUEsaUJBQVMsRUFBQztRQUNOLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMzQixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFUCxPQUFPLENBQ0gsOEJBQUMsV0FBSSxlQUFnQyxTQUFTLEdBQ3pDLFVBQUMsT0FBTyxFQUFFLE9BQU8sSUFBSyxPQUFBLENBQ25CLHVDQUFLLFNBQVMsRUFBQyxXQUFXO1FBQ3RCLDhCQUFDLHNCQUFTLElBQ04sT0FBTyxFQUFFLE9BQU8sRUFDaEIsVUFBVSxFQUFFLFlBQVksRUFDeEIsS0FBSyxFQUFDLFFBQVEsRUFDZCxJQUFJLEVBQUMsVUFBVSxFQUNmLFVBQVUsUUFDVixJQUFJLEVBQUMsTUFBTSxHQUNiO1FBQ0YsOEJBQUMsZUFBTSxJQUNILFFBQVEsRUFBRSxZQUFZLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxZQUFZLEVBQ3hELE9BQU8sRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLFlBQVksRUFDdkMsSUFBSSxFQUFDLFFBQVEsRUFDYixXQUFXLDBCQUdOO1FBQ1IsT0FBTyxJQUFJLENBQ1IsdUNBQUssU0FBUyxFQUFDLFlBQVk7WUFDdkIsOEJBQUMsb0JBQVEsSUFDTCxPQUFPLEVBQUUsT0FBTyxFQUNoQixRQUFRLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxZQUFZLEVBQ3hDLFNBQVMsRUFBQywrQkFBK0IsMEJBR2xDLENBQ1QsQ0FDVCxDQUNDLENBQ1QsRUE5QnNCLENBOEJ0QixDQUNFLENBQ1YsQ0FBQztBQUNOLENBQUMsQ0FBQztBQTVDVyxRQUFBLHFCQUFxQix5QkE0Q2hDIn0=

package/forms/ForgottenPasswordForm/types.d.ts

@@ -1,7 +1,7 @@
-import { FormProps } from "react-final-form";
+import { FormProps } from "@uxf/form/form";
 export interface ForgottenPasswordFormData {
     username: string;
 }
-export interface ForgottenPasswordFormProps extends FormProps<ForgottenPasswordFormData> {
+export interface ForgottenPasswordFormProps extends Omit<FormProps<ForgottenPasswordFormData>, "children"> {
     onLogin?: () => void;
 }

package/forms/LoginForm/LoginForm.js

@@ -69,12 +69,12 @@ var LoginForm = function (props) {
     (0, react_1.useEffect)(function () {
         setFormDisabled(false);
     }, []);
-    return (react_1.default.createElement(form_1.Form, __assign({}, formProps), function (control, formApi) { return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(text_input_1.TextInput, { className: "mb-6", isDisabled: formDisabled, label: "E-mail", name: "username", type: "email", control: control, isRequired: true }),
-        react_1.default.createElement(text_input_1.TextInput, { className: "mb-6", isDisabled: formDisabled, label: "Heslo", name: "password", type: "password", control: control, isRequired: true }),
+    return (react_1.default.createElement(form_1.Form, __assign({}, formProps), function (control, formApi) { return (react_1.default.createElement("div", { className: "space-y-6" },
+        react_1.default.createElement(text_input_1.TextInput, { isDisabled: formDisabled, label: "E-mail", name: "username", type: "email", control: control, isRequired: true }),
+        react_1.default.createElement(text_input_1.TextInput, { isDisabled: formDisabled, label: "Heslo", name: "password", type: "password", control: control, isRequired: true }),
         onForgottenPassword && (react_1.default.createElement("div", { className: "text-right" },
             react_1.default.createElement(text_link_1.TextLink, { onClick: onForgottenPassword, disabled: formApi.formState.isSubmitting, className: "uxf-typo-medium2 text-primary" }, "Nepamatujete si sv\u00E9 heslo?"))),
-        react_1.default.createElement(button_1.Button, { type: "submit", isFullWidth: true, className: "mt-6" }, "P\u0159ihl\u00E1sit se"))); }));
+        react_1.default.createElement(button_1.Button, { type: "submit", isFullWidth: true }, "P\u0159ihl\u00E1sit se"))); }));
 };
 exports.LoginForm = LoginForm;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5Gb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2Zvcm1zL0xvZ2luRm9ybS9Mb2dpbkZvcm0udHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUF1RDtBQUV2RCx1Q0FBc0M7QUFDdEMsbURBQWlEO0FBQ2pELHlDQUF3QztBQUN4QywrQ0FBNkM7QUFFdEMsSUFBTSxTQUFTLEdBQXVCLFVBQUMsS0FBSztJQUN2QyxJQUFBLG1CQUFtQixHQUFtQixLQUFLLG9CQUF4QixFQUFLLFNBQVMsVUFBSyxLQUFLLEVBQTdDLHVCQUFxQyxDQUFGLENBQVc7SUFFOUMsSUFBQSxLQUFBLE9BQWtDLElBQUEsZ0JBQVEsRUFBQyxJQUFJLENBQUMsSUFBQSxFQUEvQyxZQUFZLFFBQUEsRUFBRSxlQUFlLFFBQWtCLENBQUM7SUFFdkQsSUFBQSxpQkFBUyxFQUFDO1FBQ04sZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUVQLE9BQU8sQ0FDSCw4QkFBQyxXQUFJLGVBQW9CLFNBQVMsR0FDN0IsVUFBQyxPQUFPLEVBQUUsT0FBTyxJQUFLLE9BQUEsQ0FDbkI7UUFDSSw4QkFBQyxzQkFBUyxJQUNOLFNBQVMsRUFBQyxNQUFNLEVBQ2hCLFVBQVUsRUFBRSxZQUFZLEVBQ3hCLEtBQUssRUFBQyxRQUFRLEVBQ2QsSUFBSSxFQUFDLFVBQVUsRUFDZixJQUFJLEVBQUMsT0FBTyxFQUNaLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFVBQVUsU0FDWjtRQUNGLDhCQUFDLHNCQUFTLElBQ04sU0FBUyxFQUFDLE1BQU0sRUFDaEIsVUFBVSxFQUFFLFlBQVksRUFDeEIsS0FBSyxFQUFDLE9BQU8sRUFDYixJQUFJLEVBQUMsVUFBVSxFQUNmLElBQUksRUFBQyxVQUFVLEVBQ2YsT0FBTyxFQUFFLE9BQU8sRUFDaEIsVUFBVSxTQUNaO1FBQ0QsbUJBQW1CLElBQUksQ0FDcEIsdUNBQUssU0FBUyxFQUFDLFlBQVk7WUFDdkIsOEJBQUMsb0JBQVEsSUFDTCxPQUFPLEVBQUUsbUJBQW1CLEVBQzVCLFFBQVEsRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLFlBQVksRUFDeEMsU0FBUyxFQUFDLCtCQUErQixzQ0FHbEMsQ0FDVCxDQUNUO1FBQ0QsOEJBQUMsZUFBTSxJQUFDLElBQUksRUFBQyxRQUFRLEVBQUMsV0FBVyxRQUFDLFNBQVMsRUFBQyxNQUFNLDZCQUV6QyxDQUNWLENBQ04sRUFuQ3NCLENBbUN0QixDQUNFLENBQ1YsQ0FBQztBQUNOLENBQUMsQ0FBQztBQWpEVyxRQUFBLFNBQVMsYUFpRHBCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naW5Gb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2Zvcm1zL0xvZ2luRm9ybS9Mb2dpbkZvcm0udHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDZDQUF1RDtBQUV2RCx1Q0FBc0M7QUFDdEMsbURBQWlEO0FBQ2pELHlDQUF3QztBQUN4QywrQ0FBNkM7QUFFdEMsSUFBTSxTQUFTLEdBQXVCLFVBQUMsS0FBSztJQUN2QyxJQUFBLG1CQUFtQixHQUFtQixLQUFLLG9CQUF4QixFQUFLLFNBQVMsVUFBSyxLQUFLLEVBQTdDLHVCQUFxQyxDQUFGLENBQVc7SUFFOUMsSUFBQSxLQUFBLE9BQWtDLElBQUEsZ0JBQVEsRUFBQyxJQUFJLENBQUMsSUFBQSxFQUEvQyxZQUFZLFFBQUEsRUFBRSxlQUFlLFFBQWtCLENBQUM7SUFFdkQsSUFBQSxpQkFBUyxFQUFDO1FBQ04sZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUVQLE9BQU8sQ0FDSCw4QkFBQyxXQUFJLGVBQW9CLFNBQVMsR0FDN0IsVUFBQyxPQUFPLEVBQUUsT0FBTyxJQUFLLE9BQUEsQ0FDbkIsdUNBQUssU0FBUyxFQUFDLFdBQVc7UUFDdEIsOEJBQUMsc0JBQVMsSUFDTixVQUFVLEVBQUUsWUFBWSxFQUN4QixLQUFLLEVBQUMsUUFBUSxFQUNkLElBQUksRUFBQyxVQUFVLEVBQ2YsSUFBSSxFQUFDLE9BQU8sRUFDWixPQUFPLEVBQUUsT0FBTyxFQUNoQixVQUFVLFNBQ1o7UUFDRiw4QkFBQyxzQkFBUyxJQUNOLFVBQVUsRUFBRSxZQUFZLEVBQ3hCLEtBQUssRUFBQyxPQUFPLEVBQ2IsSUFBSSxFQUFDLFVBQVUsRUFDZixJQUFJLEVBQUMsVUFBVSxFQUNmLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFVBQVUsU0FDWjtRQUNELG1CQUFtQixJQUFJLENBQ3BCLHVDQUFLLFNBQVMsRUFBQyxZQUFZO1lBQ3ZCLDhCQUFDLG9CQUFRLElBQ0wsT0FBTyxFQUFFLG1CQUFtQixFQUM1QixRQUFRLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxZQUFZLEVBQ3hDLFNBQVMsRUFBQywrQkFBK0Isc0NBR2xDLENBQ1QsQ0FDVDtRQUNELDhCQUFDLGVBQU0sSUFBQyxJQUFJLEVBQUMsUUFBUSxFQUFDLFdBQVcsbUNBRXhCLENBQ1AsQ0FDVCxFQWpDc0IsQ0FpQ3RCLENBQ0UsQ0FDVixDQUFDO0FBQ04sQ0FBQyxDQUFDO0FBL0NXLFFBQUEsU0FBUyxhQStDcEIifQ==

package/forms/RenewPasswordForm/RenewPasswordForm.js

@@ -45,36 +45,21 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenewPasswordForm = void 0;
-var Grid_1 = __importDefault(require("@mui/material/Grid"));
+var form_1 = require("@uxf/form/form");
+var text_input_1 = require("@uxf/form/text-input");
+var button_1 = require("@uxf/ui/button");
 var react_1 = __importStar(require("react"));
-var react_final_form_1 = require("react-final-form");
-var Button_1 = require("../../ui/Button");
-var TextInput_1 = require("../components/TextInput");
-var passwordsAreSame = function (_, allValues) {
-    var _a = allValues, password = _a.password, passwordAgain = _a.passwordAgain;
-    return password === passwordAgain ? null : "Hesla musí být stejná";
-};
 var RenewPasswordForm = function (props) {
     var _a = __read((0, react_1.useState)(true), 2), formDisabled = _a[0], setFormDisabled = _a[1];
     (0, react_1.useEffect)(function () {
         setFormDisabled(false);
     }, []);
-    return (react_1.default.createElement(react_final_form_1.Form, __assign({}, props), function (_a) {
-        var handleSubmit = _a.handleSubmit, submitting = _a.submitting;
-        return (react_1.default.createElement("form", { onSubmit: handleSubmit },
-            react_1.default.createElement(Grid_1.default, { container: true, spacing: 2 },
-                react_1.default.createElement(Grid_1.default, { item: true, xs: 12 },
-                    react_1.default.createElement(TextInput_1.TextInput, { disabled: formDisabled, label: "Nov\u00E9 heslo", name: "password", type: "password", required: true })),
-                react_1.default.createElement(Grid_1.default, { item: true, xs: 12 },
-                    react_1.default.createElement(TextInput_1.TextInput, { disabled: formDisabled, label: "Znovu nov\u00E9 heslo", name: "passwordAgain", type: "password", required: true, validate: [passwordsAreSame] })),
-                react_1.default.createElement(Grid_1.default, { item: true, xs: 12 },
-                    react_1.default.createElement(Button_1.Button, { color: "primary", disabled: submitting, fullWidth: true, loading: submitting, type: "submit", variant: "contained", mt: 2 }, "Zm\u011Bnit heslo")))));
-    }));
+    return (react_1.default.createElement(form_1.Form, __assign({}, props), function (control, formApi) { return (react_1.default.createElement("div", { className: "space-y-6" },
+        react_1.default.createElement(text_input_1.TextInput, { control: control, isDisabled: formDisabled, label: "Nov\u00E9 heslo", name: "password", type: "password", isRequired: true }),
+        react_1.default.createElement(text_input_1.TextInput, { control: control, isDisabled: formDisabled, label: "Znovu nov\u00E9 heslo", name: "passwordAgain", type: "password", isRequired: true, rules: { validate: function (v) { return v === formApi.getValues("password") || "Hesla musí být stejná"; } } }),
+        react_1.default.createElement(button_1.Button, { disabled: formDisabled || formApi.formState.isSubmitting, isFullWidth: true, loading: formApi.formState.isSubmitting, type: "submit" }, "Zm\u011Bnit heslo"))); }));
 };
 exports.RenewPasswordForm = RenewPasswordForm;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVuZXdQYXNzd29yZEZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZm9ybXMvUmVuZXdQYXNzd29yZEZvcm0vUmVuZXdQYXNzd29yZEZvcm0udHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBc0M7QUFFdEMsNkNBQW1EO0FBQ25ELHFEQUF3QztBQUN4QywwQ0FBeUM7QUFDekMscURBQW9EO0FBR3BELElBQU0sZ0JBQWdCLEdBQTJCLFVBQUMsQ0FBQyxFQUFFLFNBQVM7SUFDcEQsSUFBQSxLQUE4QixTQUFrQyxFQUE5RCxRQUFRLGNBQUEsRUFBRSxhQUFhLG1CQUF1QyxDQUFDO0lBQ3ZFLE9BQU8sUUFBUSxLQUFLLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQztBQUN2RSxDQUFDLENBQUM7QUFFSyxJQUFNLGlCQUFpQixHQUFxQyxVQUFDLEtBQUs7SUFDL0QsSUFBQSxLQUFBLE9BQWtDLElBQUEsZ0JBQVEsRUFBQyxJQUFJLENBQUMsSUFBQSxFQUEvQyxZQUFZLFFBQUEsRUFBRSxlQUFlLFFBQWtCLENBQUM7SUFFdkQsSUFBQSxpQkFBUyxFQUFDO1FBQ04sZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzNCLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUVQLE9BQU8sQ0FDSCw4QkFBQyx1QkFBSSxlQUFLLEtBQUssR0FDVixVQUFDLEVBQTRCO1lBQTFCLFlBQVksa0JBQUEsRUFBRSxVQUFVLGdCQUFBO1FBQU8sT0FBQSxDQUMvQix3Q0FBTSxRQUFRLEVBQUUsWUFBWTtZQUN4Qiw4QkFBQyxjQUFJLElBQUMsU0FBUyxRQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUN0Qiw4QkFBQyxjQUFJLElBQUMsSUFBSSxRQUFDLEVBQUUsRUFBRSxFQUFFO29CQUNiLDhCQUFDLHFCQUFTLElBQ04sUUFBUSxFQUFFLFlBQVksRUFDdEIsS0FBSyxFQUFDLGlCQUFZLEVBQ2xCLElBQUksRUFBQyxVQUFVLEVBQ2YsSUFBSSxFQUFDLFVBQVUsRUFDZixRQUFRLFNBQ1YsQ0FDQztnQkFDUCw4QkFBQyxjQUFJLElBQUMsSUFBSSxRQUFDLEVBQUUsRUFBRSxFQUFFO29CQUNiLDhCQUFDLHFCQUFTLElBQ04sUUFBUSxFQUFFLFlBQVksRUFDdEIsS0FBSyxFQUFDLHVCQUFrQixFQUN4QixJQUFJLEVBQUMsZUFBZSxFQUNwQixJQUFJLEVBQUMsVUFBVSxFQUNmLFFBQVEsUUFDUixRQUFRLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUM5QixDQUNDO2dCQUNQLDhCQUFDLGNBQUksSUFBQyxJQUFJLFFBQUMsRUFBRSxFQUFFLEVBQUU7b0JBQ2IsOEJBQUMsZUFBTSxJQUNILEtBQUssRUFBQyxTQUFTLEVBQ2YsUUFBUSxFQUFFLFVBQVUsRUFDcEIsU0FBUyxRQUNULE9BQU8sRUFBRSxVQUFVLEVBQ25CLElBQUksRUFBQyxRQUFRLEVBQ2IsT0FBTyxFQUFDLFdBQVcsRUFDbkIsRUFBRSxFQUFFLENBQUMsd0JBR0EsQ0FDTixDQUNKLENBQ0osQ0FDVjtJQXJDa0MsQ0FxQ2xDLENBQ0UsQ0FDVixDQUFDO0FBQ04sQ0FBQyxDQUFDO0FBakRXLFFBQUEsaUJBQWlCLHFCQWlENUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVuZXdQYXNzd29yZEZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZm9ybXMvUmVuZXdQYXNzd29yZEZvcm0vUmVuZXdQYXNzd29yZEZvcm0udHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx1Q0FBc0M7QUFDdEMsbURBQWlEO0FBQ2pELHlDQUF3QztBQUN4Qyw2Q0FBbUQ7QUFHNUMsSUFBTSxpQkFBaUIsR0FBcUMsVUFBQyxLQUFLO0lBQy9ELElBQUEsS0FBQSxPQUFrQyxJQUFBLGdCQUFRLEVBQUMsSUFBSSxDQUFDLElBQUEsRUFBL0MsWUFBWSxRQUFBLEVBQUUsZUFBZSxRQUFrQixDQUFDO0lBRXZELElBQUEsaUJBQVMsRUFBQztRQUNOLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMzQixDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFUCxPQUFPLENBQ0gsOEJBQUMsV0FBSSxlQUE0QixLQUFLLEdBQ2pDLFVBQUMsT0FBTyxFQUFFLE9BQU8sSUFBSyxPQUFBLENBQ25CLHVDQUFLLFNBQVMsRUFBQyxXQUFXO1FBQ3RCLDhCQUFDLHNCQUFTLElBQ04sT0FBTyxFQUFFLE9BQU8sRUFDaEIsVUFBVSxFQUFFLFlBQVksRUFDeEIsS0FBSyxFQUFDLGlCQUFZLEVBQ2xCLElBQUksRUFBQyxVQUFVLEVBQ2YsSUFBSSxFQUFDLFVBQVUsRUFDZixVQUFVLFNBQ1o7UUFDRiw4QkFBQyxzQkFBUyxJQUNOLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFVBQVUsRUFBRSxZQUFZLEVBQ3hCLEtBQUssRUFBQyx1QkFBa0IsRUFDeEIsSUFBSSxFQUFDLGVBQWUsRUFDcEIsSUFBSSxFQUFDLFVBQVUsRUFDZixVQUFVLFFBQ1YsS0FBSyxFQUFFLEVBQUUsUUFBUSxFQUFFLFVBQUMsQ0FBQyxJQUFLLE9BQUEsQ0FBQyxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLElBQUksdUJBQXVCLEVBQTlELENBQThELEVBQUUsR0FDNUY7UUFDRiw4QkFBQyxlQUFNLElBQ0gsUUFBUSxFQUFFLFlBQVksSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLFlBQVksRUFDeEQsV0FBVyxRQUNYLE9BQU8sRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLFlBQVksRUFDdkMsSUFBSSxFQUFDLFFBQVEsd0JBR1IsQ0FDUCxDQUNULEVBNUJzQixDQTRCdEIsQ0FDRSxDQUNWLENBQUM7QUFDTixDQUFDLENBQUM7QUF4Q1csUUFBQSxpQkFBaUIscUJBd0M1QiJ9

package/forms/RenewPasswordForm/types.d.ts

@@ -1,6 +1,6 @@
-import { FormProps } from "react-final-form";
+import { FormProps } from "@uxf/form/form";
 export interface RenewPasswordFormData {
     password: string;
     passwordAgain: string;
 }
-export declare type RenewPasswordFormProps = FormProps<RenewPasswordFormData>;
+export declare type RenewPasswordFormProps = Omit<FormProps<RenewPasswordFormData>, "children">;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/cms",
-  "version": "6.0.0-beta.3",
+  "version": "6.0.0-beta.5",
   "description": "UXF Cms",
   "author": "UXFans <dev@uxf.cz>",
   "homepage": "https://gitlab.com/uxf-npm/cms#readme",

package/pages/ForgottenPasswordPage/ForgottenPasswordPage.js

@@ -85,9 +85,9 @@ var ForgottenPasswordPage = function (config) {
             });
         }); }, []);
         return (react_1.default.createElement(LoginLayout_1.LoginLayout, { Logo: (_a = config.ui) === null || _a === void 0 ? void 0 : _a.Logo, pageTitle: config.pageTitle, title: config.title },
-            react_1.default.createElement(ForgottenPasswordForm_1.ForgottenPasswordForm, { onSubmit: onSubmit, initialValues: INITIAL_VALUES, onLogin: config.onLogin })));
+            react_1.default.createElement(ForgottenPasswordForm_1.ForgottenPasswordForm, { onSubmit: onSubmit, defaultValues: INITIAL_VALUES, onLogin: config.onLogin })));
     };
     return Component;
 };
 exports.ForgottenPasswordPage = ForgottenPasswordPage;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRm9yZ290dGVuUGFzc3dvcmRQYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BhZ2VzL0ZvcmdvdHRlblBhc3N3b3JkUGFnZS9Gb3Jnb3R0ZW5QYXNzd29yZFBhZ2UudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDQSw2Q0FBMkM7QUFDM0MsdUNBQXlDO0FBQ3pDLDJFQUkyQztBQUMzQyxxREFBb0Q7QUFHcEQsSUFBTSxjQUFjLEdBQThCO0lBQzlDLFFBQVEsRUFBRSxFQUFFO0NBQ2YsQ0FBQztBQUVLLElBQU0scUJBQXFCLEdBQUcsVUFBQyxNQUFtQztJQUNyRSxJQUFNLFNBQVMsR0FBYTs7UUFDeEIsSUFBTSxRQUFRLEdBQUcsSUFBQSxtQkFBVyxFQUF5QyxVQUFPLE1BQU07Ozs7Ozt3QkFFMUUscUJBQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUE7O3dCQUF0QyxTQUFzQyxDQUFDOzs7O3dCQUV2QyxrQkFBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxXQUFXLENBQUMsR0FBQyxDQUFDLENBQUM7Ozs7O2FBRXJELEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFUCxPQUFPLENBQ0gsOEJBQUMseUJBQVcsSUFBQyxJQUFJLEVBQUUsTUFBQSxNQUFNLENBQUMsRUFBRSwwQ0FBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLE1BQU0sQ0FBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLO1lBQ2hGLDhCQUFDLDZDQUFxQixJQUFDLFFBQVEsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sR0FBSSxDQUMzRixDQUNqQixDQUFDO0lBQ04sQ0FBQyxDQUFDO0lBRUYsT0FBTyxTQUFTLENBQUM7QUFDckIsQ0FBQyxDQUFDO0FBbEJXLFFBQUEscUJBQXFCLHlCQWtCaEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRm9yZ290dGVuUGFzc3dvcmRQYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3BhZ2VzL0ZvcmdvdHRlblBhc3N3b3JkUGFnZS9Gb3Jnb3R0ZW5QYXNzd29yZFBhZ2UudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDQSw2Q0FBMkM7QUFDM0MsdUNBQXlDO0FBQ3pDLDJFQUkyQztBQUMzQyxxREFBb0Q7QUFHcEQsSUFBTSxjQUFjLEdBQThCO0lBQzlDLFFBQVEsRUFBRSxFQUFFO0NBQ2YsQ0FBQztBQUVLLElBQU0scUJBQXFCLEdBQUcsVUFBQyxNQUFtQztJQUNyRSxJQUFNLFNBQVMsR0FBYTs7UUFDeEIsSUFBTSxRQUFRLEdBQUcsSUFBQSxtQkFBVyxFQUFzRCxVQUFPLE1BQU07Ozs7Ozt3QkFFdkYscUJBQU0sTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUE7O3dCQUF0QyxTQUFzQyxDQUFDOzs7O3dCQUV2QyxrQkFBUyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxXQUFXLENBQUMsR0FBQyxDQUFDLENBQUM7Ozs7O2FBRXJELEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFUCxPQUFPLENBQ0gsOEJBQUMseUJBQVcsSUFBQyxJQUFJLEVBQUUsTUFBQSxNQUFNLENBQUMsRUFBRSwwQ0FBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLE1BQU0sQ0FBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLO1lBQ2hGLDhCQUFDLDZDQUFxQixJQUFDLFFBQVEsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sR0FBSSxDQUMzRixDQUNqQixDQUFDO0lBQ04sQ0FBQyxDQUFDO0lBRUYsT0FBTyxTQUFTLENBQUM7QUFDckIsQ0FBQyxDQUFDO0FBbEJXLFFBQUEscUJBQXFCLHlCQWtCaEMifQ==

package/pages/RenewPasswordPage/RenewPasswordPage.js

@@ -78,7 +78,7 @@ var RenewPasswordPage = function (config) {
             });
         }); }, [props.token]);
         return (react_1.default.createElement(LoginLayout_1.LoginLayout, { title: config.title, pageTitle: config.pageTitle, Logo: (_a = config.ui) === null || _a === void 0 ? void 0 : _a.Logo },
-            react_1.default.createElement(RenewPasswordForm_1.RenewPasswordForm, { onSubmit: onSubmit, initialValues: INITIAL_VALUES })));
+            react_1.default.createElement(RenewPasswordForm_1.RenewPasswordForm, { onSubmit: onSubmit, defaultValues: INITIAL_VALUES })));
     };
     Component.getInitialProps = function (ctx) { return __awaiter(void 0, void 0, void 0, function () {
         var token;