@uxf/form 1.0.0-beta.41 → 1.0.0-beta.42

package/combobox/combobox.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="react" />
 import { ComboboxProps as UIComboboxProps } from "@uxf/ui/combobox";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-export declare type ComboProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UIComboboxProps, "defaultValue" | "invalid" | "name" | "onChange" | "value">;
+export declare type ComboProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UIComboboxProps, "isInvalid" | "name" | "onChange" | "value"> & {
+    requiredMessage?: string;
+};
 export declare function Combobox<FormData extends Record<string, any>>(props: ComboProps<FormData>): JSX.Element;

package/combobox/combobox.js

@@ -8,11 +8,15 @@ const combobox_1 = require("@uxf/ui/combobox");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importDefault(require("react"));
 function Combobox(props) {
-    var _a;
+    var _a, _b;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
-        name: props.name,
         defaultValue: props.defaultValue,
+        name: props.name,
+        rules: {
+            required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
+            ...props.rules,
+        },
         shouldUnregister: props.shouldUnregister,
     });
     const onBlur = (event) => {
@@ -20,6 +24,6 @@ function Combobox(props) {
         field.onBlur();
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, event);
     };
-    return (react_1.default.createElement(combobox_1.Combobox, { id: props.id, name: props.name, value: field.value, onChange: (value) => field.onChange(value), onFocus: props.onFocus, onBlur: onBlur, placeholder: props.placeholder, className: props.className, label: props.label, options: props.options, isDisabled: props.options.length === 0 || props.isDisabled, error: (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message, isInvalid: fieldState.invalid, ref: field.ref, isRequired: props.isRequired, isReadOnly: props.isReadOnly, helperText: props.helperText }));
+    return (react_1.default.createElement(combobox_1.Combobox, { className: props.className, helperText: (_b = (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : props.helperText, id: props.id, isDisabled: props.options.length === 0 || props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, name: field.name, onBlur: onBlur, onChange: (value) => field.onChange(value), onFocus: props.onFocus, options: props.options, placeholder: props.placeholder, ref: field.ref, value: field.value }));
 }
 exports.Combobox = Combobox;

package/form/form.d.ts

@@ -0,0 +1,13 @@
+import { ReactNode } from "react";
+import { Control, DefaultValues, FieldValues, UseFormReset, UseFormReturn, ValidationMode } from "react-hook-form";
+export declare type FormSubmitHandler<TFieldValues extends FieldValues> = (values: TFieldValues, reset: UseFormReset<TFieldValues>) => Promise<unknown>;
+export declare type FormControl<TFieldValues extends FieldValues> = Control<TFieldValues> & {
+    formId: string;
+};
+export interface FormProps<TFieldValues extends FieldValues> {
+    children: (control: FormControl<TFieldValues>, formApi: UseFormReturn<TFieldValues>) => ReactNode;
+    defaultValues?: DefaultValues<TFieldValues>;
+    mode?: keyof ValidationMode;
+    onSubmit?: FormSubmitHandler<TFieldValues>;
+}
+export declare function Form<TFieldValues extends FieldValues>(props: FormProps<TFieldValues>): JSX.Element;

package/form/form.js

@@ -0,0 +1,47 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Form = void 0;
+const sr_only_mixin_1 = require("@uxf/ui/utils/sr-only-mixin");
+const react_1 = __importStar(require("react"));
+const react_hook_form_1 = require("react-hook-form");
+function Form(props) {
+    var _a;
+    const formId = (0, react_1.useId)();
+    const formApi = (0, react_hook_form_1.useForm)({
+        mode: (_a = props.mode) !== null && _a !== void 0 ? _a : "onSubmit",
+        defaultValues: props.defaultValues,
+    });
+    const onSubmit = async (values) => {
+        if (props.onSubmit) {
+            await props.onSubmit(values, formApi.reset);
+        }
+    };
+    const control = (0, react_1.useMemo)(() => Object.assign(formApi.control, { formId }), [formApi.control, formId]);
+    return (react_1.default.createElement("form", { id: formId, onSubmit: formApi.handleSubmit(onSubmit) },
+        props.children(control, formApi),
+        props.onSubmit && react_1.default.createElement("input", { style: sr_only_mixin_1.srOnlyMixin, type: "submit" })));
+}
+exports.Form = Form;

package/form/form.stories.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { Form } from "./form";
+declare const _default: {
+    title: string;
+    component: typeof Form;
+};
+export default _default;
+export declare function Default(): JSX.Element;

package/form/form.stories.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Default = void 0;
+const button_1 = require("@uxf/ui/button");
+const react_1 = __importDefault(require("react"));
+const text_input_1 = require("../text-input");
+const form_1 = require("./form");
+exports.default = {
+    title: "Form/Form",
+    component: form_1.Form,
+};
+function Default() {
+    return (
+    // eslint-disable-next-line no-console
+    react_1.default.createElement(form_1.Form, { onSubmit: async (values) => console.log(values) }, (control) => (react_1.default.createElement("div", { className: "space-y-4" },
+        react_1.default.createElement(text_input_1.TextInput, { label: "Default input", name: "default", control: control, isRequired: true }),
+        react_1.default.createElement(button_1.Button, { submit: true }, "Submit")))));
+}
+exports.Default = Default;

package/form/index.d.ts

@@ -0,0 +1 @@
+export * from "./form";

package/form/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./form"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/form",
-  "version": "1.0.0-beta.41",
+  "version": "1.0.0-beta.42",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,7 +13,7 @@
   "author": "UX Fans s.r.o",
   "license": "MIT",
   "dependencies": {
-    "@uxf/ui": "^1.0.0-beta.41",
+    "@uxf/ui": "^1.0.0-beta.42",
     "react-hook-form": "latest"
   }
 }

package/select/select.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="react" />
 import { SelectProps as UISelectProps } from "@uxf/ui/select";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-export declare type SelectProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UISelectProps, "defaultValue" | "isInvalid" | "name" | "onChange" | "value">;
+export declare type SelectProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UISelectProps, "isInvalid" | "name" | "onChange" | "value"> & {
+    requiredMessage?: string;
+};
 export declare function Select<FormData extends Record<string, any>>(props: SelectProps<FormData>): JSX.Element;

package/select/select.js

@@ -11,8 +11,12 @@ function Select(props) {
     var _a, _b;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
-        name: props.name,
         defaultValue: props.defaultValue,
+        name: props.name,
+        rules: {
+            required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
+            ...props.rules,
+        },
         shouldUnregister: props.shouldUnregister,
     });
     const onBlur = (event) => {
@@ -20,6 +24,6 @@ function Select(props) {
         field.onBlur();
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, event);
     };
-    return (react_1.default.createElement(select_1.Select, { id: props.id, name: props.name, value: field.value, onChange: (value) => field.onChange(value), onFocus: props.onFocus, onBlur: onBlur, placeholder: props.placeholder, className: props.className, label: props.label, options: props.options, isDisabled: props.options.length === 0 || props.isDisabled, helperText: (_b = (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : props.helperText, isInvalid: fieldState.invalid, ref: field.ref, isRequired: props.isRequired, isReadOnly: props.isReadOnly }));
+    return (react_1.default.createElement(select_1.Select, { className: props.className, helperText: (_b = (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : props.helperText, id: props.id, isDisabled: props.options.length === 0 || props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, name: field.name, onBlur: onBlur, onChange: (value) => field.onChange(value), onFocus: props.onFocus, options: props.options, placeholder: props.placeholder, ref: field.ref, value: field.value }));
 }
 exports.Select = Select;

package/storybook/form.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Form = void 0;
+const button_1 = require("@uxf/ui/button");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importDefault(require("react"));
 const form_data_printer_1 = require("./form-data-printer");
@@ -15,6 +16,6 @@ function Form(props) {
         props.children(form),
         react_1.default.createElement("div", { className: "my-4" },
             react_1.default.createElement(form_data_printer_1.FormDataPrinter, { control: form.control })),
-        react_1.default.createElement("button", { type: "submit" }, "Submit form")));
+        react_1.default.createElement(button_1.Button, { submit: true }, "Submit")));
 }
 exports.Form = Form;

package/text-input/text-input.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { TextInputProps as UITextInputProps } from "@uxf/ui/text-input";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-export declare type TextInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITextInputProps, "value" | "onChange"> & {
+export declare type TextInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITextInputProps, "isInvalid" | "name" | "value" | "onChange"> & {
     requiredMessage?: string;
 };
 export declare function TextInput<FormData extends Record<string, any>>(props: TextInputProps<FormData>): JSX.Element;

package/text-input/text-input.js

@@ -10,7 +10,7 @@ const react_1 = __importDefault(require("react"));
 const EMAIL_REGEXP = /^(([^<>()[\]\\.,;:\s@À-ÖÙ-öù-ÿĀ-žḀ-ỿ"]+(\.[^<>()[\]\\.,;:\s@À-ÖÙ-öù-ÿĀ-žḀ-ỿ"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 const PHONE_REGEXP = /^(\+)?[\d\s]*$/;
 function TextInput(props) {
-    var _a, _b;
+    var _a, _b, _c;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         name: props.name,
@@ -34,6 +34,6 @@ function TextInput(props) {
         field.onBlur();
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, event);
     };
-    return (react_1.default.createElement(text_input_1.TextInput, { id: props.id, name: props.name, value: field.value, onChange: field.onChange, onFocus: props.onFocus, onBlur: onBlur, isRequired: props.isRequired, isReadOnly: props.isReadOnly, isDisabled: props.isDisabled, isInvalid: !!fieldState.error, helperText: (_b = (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : props.helperText, placeholder: props.placeholder, leftElement: props.leftElement, rightElement: props.rightElement, variant: props.variant, size: props.size, className: props.className, label: props.label, form: props.form, inputMode: props.inputMode, leftAddon: props.leftAddon, rightAddon: props.rightAddon, autoComplete: props.autoComplete, enterKeyHint: props.enterKeyHint, type: props.type }));
+    return (react_1.default.createElement(text_input_1.TextInput, { autoComplete: props.autoComplete, className: props.className, enterKeyHint: props.enterKeyHint, form: props.form, helperText: (_b = (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : props.helperText, id: props.id, inputMode: props.inputMode, isDisabled: props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, leftAddon: props.leftAddon, leftElement: props.leftElement, name: field.name, onBlur: onBlur, onChange: field.onChange, onFocus: props.onFocus, placeholder: props.placeholder, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, type: props.type, value: (_c = field.value) !== null && _c !== void 0 ? _c : "", variant: props.variant }));
 }
 exports.TextInput = TextInput;

package/textarea/textarea.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="react" />
 import { TextareaProps as UITextareaProps } from "@uxf/ui/textarea";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-export declare type TextareaProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITextareaProps, "id" | "invalid" | "name" | "onChange" | "value">;
+export declare type TextareaProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITextareaProps, "isInvalid" | "name" | "onChange" | "value"> & {
+    requiredMessage?: string;
+};
 export declare function Textarea<FormData extends Record<string, any>>(props: TextareaProps<FormData>): JSX.Element;

package/textarea/textarea.js

@@ -28,22 +28,22 @@ const textarea_1 = require("@uxf/ui/textarea");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importStar(require("react"));
 function Textarea(props) {
-    var _a;
+    var _a, _b;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
+        defaultValue: props.defaultValue,
         name: props.name,
         rules: {
-            required: props.required ? "Toto pole je povinné" : undefined,
+            required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
             ...props.rules,
         },
         shouldUnregister: props.shouldUnregister,
     });
-    const _onBlur = (0, react_1.useCallback)((e) => {
+    const onBlur = (0, react_1.useCallback)((e) => {
         var _a;
         field.onBlur();
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     }, [field, props]);
-    const inputId = `${props.form ? props.form + "__" : ""}${name}`;
-    return (react_1.default.createElement(textarea_1.Textarea, { error: (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message, form: props.form, id: inputId, invalid: fieldState.invalid, name: field.name, onBlur: _onBlur, onChange: field.onChange, ref: field.ref, required: props.required, value: field.value || "", autoComplete: props.autoComplete, className: props.className, disabled: props.disabled, disableAutoHeight: props.disableAutoHeight, label: props.label, maxLength: props.maxLength, minLength: props.minLength, onFocus: props.onFocus, placeholder: props.placeholder, readOnly: props.readOnly, rows: props.rows, style: props.style }));
+    return (react_1.default.createElement(textarea_1.Textarea, { autoComplete: props.autoComplete, className: props.className, disableAutoHeight: props.disableAutoHeight, form: props.form, helperText: (_b = (_a = fieldState.error) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : props.helperText, id: props.id, isDisabled: props.isDisabled, isInvalid: !!fieldState.error, isReadOnly: props.isReadOnly, isRequired: props.isRequired, label: props.label, maxLength: props.maxLength, minLength: props.minLength, name: field.name, onBlur: onBlur, onChange: field.onChange, onFocus: props.onFocus, placeholder: props.placeholder, ref: field.ref, rows: props.rows, value: field.value || "" }));
 }
 exports.Textarea = Textarea;

package/textarea/textarea.stories.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
 const react_1 = __importDefault(require("react"));
-const textarea_1 = require("./textarea");
 const form_1 = require("../storybook/form");
+const textarea_1 = require("./textarea");
 exports.default = {
     title: "Form/Textarea",
     component: textarea_1.Textarea,