@uxf/form 1.0.0-beta.45 → 1.0.0-beta.47

package/combobox/combobox.js

@@ -8,14 +8,14 @@ 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, _b;
+    var _a, _b, _c;
     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,
-            ...props.rules,
+            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -24,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, { 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 }));
+    return (react_1.default.createElement(combobox_1.Combobox, { className: props.className, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : 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/package.json

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

package/select/select.js

@@ -8,14 +8,14 @@ const select_1 = require("@uxf/ui/select");
 const react_hook_form_1 = require("react-hook-form");
 const react_1 = __importDefault(require("react"));
 function Select(props) {
-    var _a, _b;
+    var _a, _b, _c;
     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,
-            ...props.rules,
+            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -24,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, { 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 }));
+    return (react_1.default.createElement(select_1.Select, { className: props.className, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : 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/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, "isInvalid" | "name" | "value" | "onChange"> & {
+export declare type TextInputProps<FormData extends FieldValues> = UseControllerProps<FormData> & Omit<UITextInputProps, "isInvalid" | "name" | "onChange" | "value"> & {
     requiredMessage?: string;
 };
-export declare function TextInput<FormData extends Record<string, any>>(props: TextInputProps<FormData>): JSX.Element;
+export declare function TextInput<FormData extends FieldValues>(props: TextInputProps<FormData>): JSX.Element;

package/text-input/text-input.js

@@ -10,9 +10,10 @@ 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, _c;
+    var _a, _b, _c, _d;
     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,
@@ -27,13 +28,15 @@ function TextInput(props) {
                         message: "Zadaný telefon není ve správném formátu",
                     }
                     : undefined,
+            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
         },
+        shouldUnregister: props.shouldUnregister,
     });
     const onBlur = (event) => {
         var _a;
         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: (_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 }));
+    return (react_1.default.createElement(text_input_1.TextInput, { autoComplete: props.autoComplete, className: props.className, enterKeyHint: props.enterKeyHint, form: props.form, helperText: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : 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: (_d = field.value) !== null && _d !== void 0 ? _d : "", variant: props.variant }));
 }
 exports.TextInput = TextInput;

package/textarea/textarea.js

@@ -28,14 +28,14 @@ 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, _b;
+    var _a, _b, _c;
     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,
-            ...props.rules,
+            ...((_a = props.rules) !== null && _a !== void 0 ? _a : {}),
         },
         shouldUnregister: props.shouldUnregister,
     });
@@ -44,6 +44,6 @@ 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: (_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 || "" }));
+    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, 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;