@uxf/form 1.0.0-beta.99 → 1.0.0

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@uxf/form",
-  "version": "1.0.0-beta.99",
+  "version": "1.0.0",
   "description": "",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "npm run compile",
-    "compile": "tsc -P tsconfig.json",
+    "build": "tsc -P tsconfig.json",
     "typecheck": "tsc --noEmit --skipLibCheck"
   },
   "author": "UX Fans s.r.o",
   "license": "MIT",
   "dependencies": {
-    "@uxf/ui": "^1.0.0-beta.99",
-    "react-hook-form": "latest"
+    "@uxf/ui": "1.0.0",
+    "react-hook-form": "7.44.3",
+    "coordinate-parser": "1.0.7"
   }
-}
+}

package/radio-group/radio-group.d.ts

@@ -1,7 +1,14 @@
-/// <reference types="react" />
-import { RadioGroupProps as UIRadioGroupProps } from "@uxf/ui/radio-group";
+import { RadioGroupOptionValue, RadioGroupProps as UIRadioGroupProps } from "@uxf/ui/radio-group";
+import React from "react";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-export declare type RadioGroupProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UIRadioGroupProps, "isInvalid" | "name" | "onChange" | "value"> & {
+import { FormControlProps } from "@uxf/ui/types";
+type OnChangeHandler = FormControlProps<RadioGroupOptionValue | null>["onChange"];
+export type RadioGroupProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UIRadioGroupProps, "isInvalid" | "name" | "onChange" | "value"> & {
+    onChange?: OnChangeHandler;
     requiredMessage?: string;
 };
-export declare function RadioGroup<FormData extends Record<string, any>>(props: RadioGroupProps<FormData>): JSX.Element;
+export declare function RadioGroup<FormData extends Record<string, any>>(props: RadioGroupProps<FormData>): React.JSX.Element;
+export declare namespace RadioGroup {
+    var displayName: string;
+}
+export {};

package/radio-group/radio-group.js

@@ -7,15 +7,18 @@ exports.RadioGroup = void 0;
 const radio_group_1 = require("@uxf/ui/radio-group");
 const react_1 = __importDefault(require("react"));
 const react_hook_form_1 = require("react-hook-form");
+const form_id_context_1 = require("../form-id-context");
 function RadioGroup(props) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
+    const formId = (0, form_id_context_1.useFormIdContext)();
+    const id = (_a = props.id) !== null && _a !== void 0 ? _a : `${formId}__${props.name}`;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         defaultValue: props.defaultValue,
         name: props.name,
         rules: {
             required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
-            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
+            ...((_b = props.rules) !== null && _b !== void 0 ? _b : {}),
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -24,6 +27,12 @@ function RadioGroup(props) {
         field.onBlur();
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, event);
     };
-    return (react_1.default.createElement(radio_group_1.RadioGroup, { className: props.className, forceColumn: props.forceColumn, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.helperText, hiddenLabel: props.hiddenLabel, 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, ref: field.ref, style: props.style, value: field.value, variant: props.variant }));
+    const onChange = (value, event) => {
+        var _a;
+        field.onChange(value);
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, value, event);
+    };
+    return (react_1.default.createElement(radio_group_1.RadioGroup, { className: props.className, forceColumn: props.forceColumn, helperText: (_d = (_c = fieldState.error) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : props.helperText, hiddenLabel: props.hiddenLabel, id: 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: onChange, onFocus: props.onFocus, options: props.options, ref: field.ref, style: props.style, value: (_e = field.value) !== null && _e !== void 0 ? _e : null, variant: props.variant }));
 }
 exports.RadioGroup = RadioGroup;
+RadioGroup.displayName = "UxfFormRadioGroup";

package/radio-group/radio-group.stories.d.ts

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

package/radio-group/radio-group.stories.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
 const button_1 = require("@uxf/ui/button");
 const react_1 = __importDefault(require("react"));
-const form_1 = require("../storybook/form");
+const storybook_form_1 = require("../storybook/storybook-form");
 const index_1 = require("./index");
 exports.default = {
     title: "Form/RadioGroup",
@@ -33,7 +33,7 @@ function Default() {
         react_1.default.createElement(index_1.RadioGroup, { control: control, helperText: "Choose one option", id: "radio-group", label: "Radio group form with helper text", name: "radio-group-helper-text", options: options }),
         react_1.default.createElement(index_1.RadioGroup, { control: control, id: "radio-group", label: "Radio group form with variant button", name: "radio-group-button", options: options, variant: "radioButton" }),
         react_1.default.createElement(button_1.Button, { type: "submit" }, "Submit")));
-    return (react_1.default.createElement(form_1.Form, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
+    return (react_1.default.createElement(storybook_form_1.StorybookForm, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
         react_1.default.createElement("div", { className: "light space-y-2 p-20 lg:w-1/2" }, storyFormRadioGroup(control)),
         react_1.default.createElement("div", { className: "dark space-y-2 bg-gray-900 p-20 lg:w-1/2" }, storyFormRadioGroup(control))))));
 }

package/select/select.d.ts

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

package/select/select.js

@@ -7,15 +7,18 @@ exports.Select = void 0;
 const select_1 = require("@uxf/ui/select");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importDefault(require("react"));
+const form_id_context_1 = require("../form-id-context");
 function Select(props) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
+    const formId = (0, form_id_context_1.useFormIdContext)();
+    const id = (_a = props.id) !== null && _a !== void 0 ? _a : `${formId}__${props.name}`;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         defaultValue: props.defaultValue,
         name: props.name,
         rules: {
             required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
-            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
+            ...((_b = props.rules) !== null && _b !== void 0 ? _b : {}),
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -24,6 +27,12 @@ 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, { className: props.className, dropdownPlacement: props.dropdownPlacement, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.helperText, hiddenLabel: props.hiddenLabel, 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 }));
+    const onChange = (value, event) => {
+        var _a;
+        field.onChange(value);
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, value, event);
+    };
+    return (react_1.default.createElement(select_1.Select, { className: props.className, dropdownPlacement: props.dropdownPlacement, forwardRef: field.ref, helperText: (_d = (_c = fieldState.error) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : props.helperText, hiddenLabel: props.hiddenLabel, id: id, isClearable: props.isClearable, 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: onChange, onFocus: props.onFocus, options: props.options, placeholder: props.placeholder, value: field.value }));
 }
 exports.Select = Select;
+Select.displayName = "UxfFormSelect";

package/select/select.stories.d.ts

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

package/select/select.stories.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
 const react_1 = __importDefault(require("react"));
 const select_1 = require("./select");
-const form_1 = require("../storybook/form");
+const storybook_form_1 = require("../storybook/storybook-form");
 const button_1 = require("@uxf/ui/button");
 exports.default = {
     title: "Form/Select",
@@ -17,14 +17,21 @@ const options = [
     { id: "two", label: "Option two" },
     { id: "three", label: "Option three" },
 ];
+const numberOptions = [
+    { id: 0, label: "Option zero" },
+    { id: 1, label: "Option one" },
+    { id: 2, label: "Option two" },
+];
 function Default() {
     const storyFormSelects = (control) => (react_1.default.createElement("div", { className: "space-y-4" },
-        react_1.default.createElement(select_1.Select, { label: "Select form", name: "select", control: control, placeholder: "placeholder", options: options, id: "form-select" }),
+        react_1.default.createElement(select_1.Select, { label: "Select form", name: "select", control: control, placeholder: "placeholder", options: options, id: "form-select", isClearable: true }),
         react_1.default.createElement(select_1.Select, { label: "Select form disabled", name: "select-disabled", control: control, placeholder: "placeholder", options: options, id: "form-select", isDisabled: true }),
         react_1.default.createElement(select_1.Select, { label: "Select form with helper text", name: "select-helper-text", control: control, placeholder: "placeholder", options: options, id: "form-select", helperText: "Choose one option" }),
         react_1.default.createElement(select_1.Select, { label: "Select form with dropdown top", dropdownPlacement: "top", name: "select-dropdown-top", control: control, placeholder: "placeholder", options: options, id: "form-select" }),
+        react_1.default.createElement(select_1.Select, { label: "Select form clearable", name: "select-dropdown-clearable", control: control, placeholder: "placeholder", options: options, id: "form-select", isClearable: true }),
+        react_1.default.createElement(select_1.Select, { label: "Select form with number options", name: "select-dropdown-number", control: control, placeholder: "placeholder", options: numberOptions, id: "form-select", isClearable: true }),
         react_1.default.createElement(button_1.Button, { type: "submit" }, "Submit")));
-    return (react_1.default.createElement(form_1.Form, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
+    return (react_1.default.createElement(storybook_form_1.StorybookForm, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
         react_1.default.createElement("div", { className: "light space-y-2 p-20 lg:w-1/2" }, storyFormSelects(control)),
         react_1.default.createElement("div", { className: "dark space-y-2 bg-gray-900 p-20 lg:w-1/2" }, storyFormSelects(control))))));
 }

package/storybook/form-data-printer.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from "react";
 interface FormDataPrinterProps {
     control: any;
 }
-export declare function FormDataPrinter(props: FormDataPrinterProps): JSX.Element;
+export declare function FormDataPrinter(props: FormDataPrinterProps): React.JSX.Element;
 export {};

package/storybook/storybook-form.d.ts

@@ -0,0 +1,7 @@
+import React, { ReactNode } from "react";
+import { UseFormProps, UseFormReturn } from "react-hook-form";
+interface FormProps extends UseFormProps {
+    children: (form: UseFormReturn) => ReactNode;
+}
+export declare function StorybookForm(props: FormProps): React.JSX.Element;
+export {};

package/storybook/{form.js → storybook-form.js}

@@ -3,19 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Form = void 0;
+exports.StorybookForm = 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 react_hook_form_1 = require("react-hook-form");
 const form_data_printer_1 = require("./form-data-printer");
-function Form(props) {
-    const form = (0, react_hook_form_1.useForm)();
+const form_1 = require("../form");
+function StorybookForm(props) {
+    const form = (0, react_hook_form_1.useForm)(props);
     return (
     // eslint-disable-next-line no-console
-    react_1.default.createElement("form", { onSubmit: form.handleSubmit(console.log) },
+    react_1.default.createElement(form_1.Form, { formApi: form, id: "storybook-form", onSubmit: console.log },
         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_1.Button, { type: "submit" }, "Submit")));
 }
-exports.Form = Form;
+exports.StorybookForm = StorybookForm;

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

@@ -1,7 +1,10 @@
-/// <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, "isInvalid" | "max" | "min" | "pattern" | "step" | "name" | "onChange" | "value" | "type"> & {
+import React from "react";
+import { FormControlProps } from "@uxf/ui/types";
+type OnChangeHandler = FormControlProps<string>["onChange"];
+export type TextInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITextInputProps, "isInvalid" | "max" | "min" | "pattern" | "step" | "name" | "onChange" | "value" | "type"> & {
+    onChange?: OnChangeHandler;
     requiredMessage?: string;
 } & ({
     type: "email";
@@ -12,8 +15,12 @@ export declare type TextInputProps<FormData extends FieldValues> = UseController
     invalidEmailMessage?: never;
     invalidPhoneMessage?: string;
 } | {
-    type?: "password" | "search" | "text" | "url";
     invalidEmailMessage?: never;
     invalidPhoneMessage?: never;
+    type?: "password" | "search" | "text" | "url";
 });
-export declare function TextInput<FormData extends FieldValues>(props: TextInputProps<FormData>): JSX.Element;
+export declare function TextInput<FormData extends FieldValues>(props: TextInputProps<FormData>): React.JSX.Element;
+export declare namespace TextInput {
+    var displayName: string;
+}
+export {};

package/text-input/text-input.js

@@ -7,10 +7,13 @@ exports.TextInput = void 0;
 const text_input_1 = require("@uxf/ui/text-input");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importDefault(require("react"));
+const form_id_context_1 = require("../form-id-context");
 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, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
+    const formId = (0, form_id_context_1.useFormIdContext)();
+    const id = (_a = props.id) !== null && _a !== void 0 ? _a : `${formId}__${props.name}`;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         defaultValue: props.defaultValue,
@@ -20,15 +23,15 @@ function TextInput(props) {
             pattern: props.type === "email"
                 ? {
                     value: EMAIL_REGEXP,
-                    message: (_a = props.invalidEmailMessage) !== null && _a !== void 0 ? _a : "E-mail by měl být ve\xa0formátu: info@email.cz",
+                    message: (_b = props.invalidEmailMessage) !== null && _b !== void 0 ? _b : "E-mail by měl být ve\xa0formátu: info@email.cz",
                 }
                 : props.type === "tel"
                     ? {
                         value: PHONE_REGEXP,
-                        message: (_b = props.invalidPhoneMessage) !== null && _b !== void 0 ? _b : "Zadaný telefon není ve správném formátu",
+                        message: (_c = props.invalidPhoneMessage) !== null && _c !== void 0 ? _c : "Zadaný telefon není ve správném formátu",
                     }
                     : undefined,
-            ...((_c = props.rules) !== null && _c !== void 0 ? _c : {}),
+            ...((_d = props.rules) !== null && _d !== void 0 ? _d : {}),
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -37,6 +40,12 @@ 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, { autoComplete: props.autoComplete, className: props.className, enterKeyHint: props.enterKeyHint, form: props.form, helperText: (_e = (_d = fieldState.error) === null || _d === void 0 ? void 0 : _d.message) !== null && _e !== void 0 ? _e : props.helperText, hiddenLabel: props.hiddenLabel, 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, maxLength: props.maxLength, minLength: props.minLength, name: field.name, onBlur: onBlur, onChange: field.onChange, onFocus: props.onFocus, onKeyDown: props.onKeyDown, placeholder: props.placeholder, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, type: props.type, value: (_f = field.value) !== null && _f !== void 0 ? _f : "", variant: props.variant }));
+    const onChange = (value, event) => {
+        var _a;
+        field.onChange(value);
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, value, event);
+    };
+    return (react_1.default.createElement(text_input_1.TextInput, { autoComplete: props.autoComplete, className: props.className, enterKeyHint: props.enterKeyHint, form: props.form, helperText: (_f = (_e = fieldState.error) === null || _e === void 0 ? void 0 : _e.message) !== null && _f !== void 0 ? _f : props.helperText, hiddenLabel: props.hiddenLabel, id: 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, maxLength: props.maxLength, minLength: props.minLength, name: field.name, onBlur: onBlur, onChange: onChange, onFocus: props.onFocus, onKeyDown: props.onKeyDown, placeholder: props.placeholder, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, type: props.type, value: (_g = field.value) !== null && _g !== void 0 ? _g : "", variant: props.variant }));
 }
 exports.TextInput = TextInput;
+TextInput.displayName = "UxfFormTextInput";

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

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

package/text-input/text-input.stories.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
 const react_1 = __importDefault(require("react"));
 const text_input_1 = require("./text-input");
-const form_1 = require("../storybook/form");
+const storybook_form_1 = require("../storybook/storybook-form");
 const button_1 = require("@uxf/ui/button");
 exports.default = {
     title: "Form/TextInput",
@@ -14,13 +14,13 @@ exports.default = {
 };
 function Default() {
     const storyFormTextInputs = (control) => (react_1.default.createElement("div", { className: "space-y-4" },
-        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte ...", label: "Default input", name: "default", control: control }),
-        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte ...", label: "Required input", name: "required", control: control, isRequired: true }),
-        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte ...", label: "E-mail required input", name: "email", type: "email", control: control, isRequired: true }),
-        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte ...", label: "Phone required input", name: "phone", type: "tel", control: control, isRequired: true }),
-        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte ...", label: "Password input", name: "password", type: "password", control: control }),
+        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte...", label: "Default input", name: "default", control: control, autoComplete: "off" }),
+        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte...", label: "Required input", name: "required", control: control, isRequired: true }),
+        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte...", label: "E-mail required input", name: "email", type: "email", control: control, isRequired: true }),
+        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte...", label: "Phone required input", name: "phone", type: "tel", control: control, isRequired: true }),
+        react_1.default.createElement(text_input_1.TextInput, { placeholder: "Zadejte...", label: "Password input", name: "password", type: "password", control: control }),
         react_1.default.createElement(button_1.Button, { type: "submit" }, "Submit")));
-    return (react_1.default.createElement(form_1.Form, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
+    return (react_1.default.createElement(storybook_form_1.StorybookForm, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
         react_1.default.createElement("div", { className: "light space-y-2 p-20 lg:w-1/2" }, storyFormTextInputs(control)),
         react_1.default.createElement("div", { className: "dark space-y-2 bg-gray-900 p-20 lg:w-1/2" }, storyFormTextInputs(control))))));
 }

package/textarea/textarea.d.ts

@@ -1,7 +1,14 @@
-/// <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, "isInvalid" | "name" | "onChange" | "value"> & {
+import React from "react";
+import { FormControlProps } from "@uxf/ui/types";
+type OnChangeHandler = FormControlProps<string, HTMLTextAreaElement>["onChange"];
+export type TextareaProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITextareaProps, "isInvalid" | "name" | "onChange" | "value"> & {
+    onChange?: OnChangeHandler;
     requiredMessage?: string;
 };
-export declare function Textarea<FormData extends Record<string, any>>(props: TextareaProps<FormData>): JSX.Element;
+export declare function Textarea<FormData extends Record<string, any>>(props: TextareaProps<FormData>): React.JSX.Element;
+export declare namespace Textarea {
+    var displayName: string;
+}
+export {};

package/textarea/textarea.js

@@ -27,15 +27,18 @@ exports.Textarea = void 0;
 const textarea_1 = require("@uxf/ui/textarea");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importStar(require("react"));
+const form_id_context_1 = require("../form-id-context");
 function Textarea(props) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
+    const formId = (0, form_id_context_1.useFormIdContext)();
+    const id = (_a = props.id) !== null && _a !== void 0 ? _a : `${formId}__${props.name}`;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         defaultValue: props.defaultValue,
         name: props.name,
         rules: {
             required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
-            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
+            ...((_b = props.rules) !== null && _b !== void 0 ? _b : {}),
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -44,6 +47,12 @@ function Textarea(props) {
         field.onBlur();
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     }, [field, props]);
-    return (react_1.default.createElement(textarea_1.Textarea, { autoComplete: props.autoComplete, className: props.className, disableAutoHeight: props.disableAutoHeight, form: props.form, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.helperText, hiddenLabel: props.hiddenLabel, 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 || "" }));
+    const onChange = (value, event) => {
+        var _a;
+        field.onChange(value);
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, value, event);
+    };
+    return (react_1.default.createElement(textarea_1.Textarea, { autoComplete: props.autoComplete, className: props.className, disableAutoHeight: props.disableAutoHeight, form: props.form, helperText: (_d = (_c = fieldState.error) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : props.helperText, hiddenLabel: props.hiddenLabel, id: 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: onChange, onFocus: props.onFocus, placeholder: props.placeholder, ref: field.ref, rows: props.rows, value: field.value || "" }));
 }
 exports.Textarea = Textarea;
+Textarea.displayName = "UxfFormTextarea";

package/textarea/textarea.stories.d.ts

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

package/textarea/textarea.stories.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
 const react_1 = __importDefault(require("react"));
-const form_1 = require("../storybook/form");
+const storybook_form_1 = require("../storybook/storybook-form");
 const textarea_1 = require("./textarea");
 const button_1 = require("@uxf/ui/button");
 exports.default = {
@@ -17,7 +17,7 @@ function Default() {
         react_1.default.createElement(textarea_1.Textarea, { label: "Textarea", name: "textarea", control: control, placeholder: "placeholder", form: "form-textarea" }),
         react_1.default.createElement(textarea_1.Textarea, { label: "Textarea required", name: "textarea-required", control: control, placeholder: "placeholder", form: "form-textarea", isRequired: true }),
         react_1.default.createElement(button_1.Button, { type: "submit" }, "Submit")));
-    return (react_1.default.createElement(form_1.Form, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
+    return (react_1.default.createElement(storybook_form_1.StorybookForm, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
         react_1.default.createElement("div", { className: "light space-y-2 p-20 lg:w-1/2" }, storyFormTextAreas(control)),
         react_1.default.createElement("div", { className: "dark space-y-2 bg-gray-900 p-20 lg:w-1/2" }, storyFormTextAreas(control))))));
 }

package/time-picker-input/time-picker-input.d.ts

@@ -1,7 +1,12 @@
-/// <reference types="react" />
 import { TimePickerInputProps as UITimePickerInputProps } from "@uxf/ui/time-picker-input";
 import { FieldValues, UseControllerProps } from "react-hook-form";
-export declare type TimePickerInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITimePickerInputProps, "isInvalid" | "max" | "min" | "pattern" | "step" | "name" | "onChange" | "value"> & {
+import React from "react";
+import { DatePickerInputProps as UIDatePickerInputProps } from "@uxf/ui/date-picker-input";
+export type TimePickerInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITimePickerInputProps, "isInvalid" | "max" | "min" | "pattern" | "step" | "name" | "onChange" | "value"> & {
+    onChange?: UIDatePickerInputProps["onChange"];
     requiredMessage?: string;
 };
-export declare function TimePickerInput<FormData extends FieldValues>(props: TimePickerInputProps<FormData>): JSX.Element;
+export declare function TimePickerInput<FormData extends FieldValues>(props: TimePickerInputProps<FormData>): React.JSX.Element;
+export declare namespace TimePickerInput {
+    var displayName: string;
+}

package/time-picker-input/time-picker-input.js

@@ -1,4 +1,27 @@
 "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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,15 +30,34 @@ exports.TimePickerInput = void 0;
 const time_picker_input_1 = require("@uxf/ui/time-picker-input");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importDefault(require("react"));
+const dayjs_1 = __importStar(require("dayjs"));
+const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
+const form_id_context_1 = require("../form-id-context");
+(0, dayjs_1.extend)(customParseFormat_1.default);
 function TimePickerInput(props) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g;
+    const formId = (0, form_id_context_1.useFormIdContext)();
+    const id = (_a = props.id) !== null && _a !== void 0 ? _a : `${formId}__${props.name}`;
     const { field, fieldState } = (0, react_hook_form_1.useController)({
         control: props.control,
         defaultValue: props.defaultValue,
         name: props.name,
         rules: {
             required: props.isRequired ? props.requiredMessage || "Toto pole je povinné" : undefined,
-            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
+            ...((_b = props.rules) !== null && _b !== void 0 ? _b : {}),
+            validate: {
+                validTime: (value) => {
+                    if (!value) {
+                        return;
+                    }
+                    if (!(0, dayjs_1.default)(value, time_picker_input_1.OUTPUT_TIME_FORMAT, true).isValid()) {
+                        return `Čas musí být ve formátu ${time_picker_input_1.DISPLAY_TIME_FORMAT}.`;
+                    }
+                },
+                ...(typeof ((_c = props.rules) === null || _c === void 0 ? void 0 : _c.validate) === "function"
+                    ? { custom: props.rules.validate }
+                    : (_e = (_d = props.rules) === null || _d === void 0 ? void 0 : _d.validate) !== null && _e !== void 0 ? _e : {}),
+            },
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -24,6 +66,12 @@ function TimePickerInput(props) {
         field.onBlur();
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, event);
     };
-    return (react_1.default.createElement(time_picker_input_1.TimePickerInput, { className: props.className, form: props.form, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.helperText, hiddenLabel: props.hiddenLabel, id: props.id, 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, value: field.value, variant: props.variant }));
+    const onChange = (value, event) => {
+        var _a;
+        field.onChange(value);
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, value, event);
+    };
+    return (react_1.default.createElement(time_picker_input_1.TimePickerInput, { className: props.className, form: props.form, helperText: (_g = (_f = fieldState.error) === null || _f === void 0 ? void 0 : _f.message) !== null && _g !== void 0 ? _g : props.helperText, hiddenLabel: props.hiddenLabel, id: id, isClearable: props.isClearable, 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: onChange, onFocus: props.onFocus, placeholder: props.placeholder, popoverPlacement: props.popoverPlacement, popoverStrategy: props.popoverStrategy, ref: field.ref, rightAddon: props.rightAddon, rightElement: props.rightElement, size: props.size, triggerElement: props.triggerElement, value: field.value, variant: props.variant }));
 }
 exports.TimePickerInput = TimePickerInput;
+TimePickerInput.displayName = "UxfFormTimePickerInput";

package/time-picker-input/time-picker-input.stories.d.ts

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

package/time-picker-input/time-picker-input.stories.js

@@ -6,17 +6,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Default = void 0;
 const react_1 = __importDefault(require("react"));
 const time_picker_input_1 = require("./time-picker-input");
-const form_1 = require("../storybook/form");
+const storybook_form_1 = require("../storybook/storybook-form");
 const button_1 = require("@uxf/ui/button");
+const dayjs_1 = __importDefault(require("dayjs"));
 exports.default = {
     title: "Form/TimePickerInput",
     component: time_picker_input_1.TimePickerInput,
 };
 function Default() {
     const storyFormDatePickers = (control) => (react_1.default.createElement("div", { className: "space-y-4" },
-        react_1.default.createElement(time_picker_input_1.TimePickerInput, { label: "Default date picker", name: "default", control: control }),
+        react_1.default.createElement(time_picker_input_1.TimePickerInput, { control: control, isClearable: true, label: "Default time picker", name: "default", placeholder: "" }),
+        react_1.default.createElement(time_picker_input_1.TimePickerInput, { control: control, isClearable: true, label: "Default time picker with default value", name: "withDefaultValue", placeholder: "" }),
         react_1.default.createElement(button_1.Button, { type: "submit" }, "Submit")));
-    return (react_1.default.createElement(form_1.Form, null, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
+    return (react_1.default.createElement(storybook_form_1.StorybookForm, { defaultValues: {
+            withDefaultValue: (0, dayjs_1.default)().format("HH:mm:ss"),
+        } }, ({ control }) => (react_1.default.createElement("div", { className: "flex flex-col lg:flex-row" },
         react_1.default.createElement("div", { className: "light space-y-2 p-20 lg:w-1/2" }, storyFormDatePickers(control)),
         react_1.default.createElement("div", { className: "dark space-y-2 bg-gray-900 p-20 text-white lg:w-1/2" }, storyFormDatePickers(control))))));
 }