@uxf/ui 1.0.0-beta.35 → 1.0.0-beta.37

package/combobox/combobox.js

@@ -48,10 +48,10 @@ function Combobox(props, ref) {
         react_2.default.createElement(react_1.Combobox.Button, { as: "div", className: (0, cx_1.cx)("uxf-combobox__button", (renderProps.open || input.focused) && classes_1.CLASSES.IS_FOCUSED, renderProps.disabled && classes_1.CLASSES.IS_DISABLED, props.isReadOnly && classes_1.CLASSES.IS_READONLY, props.isInvalid && classes_1.CLASSES.IS_INVALID), onBlur: input.onBlur, onFocus: input.onFocus, tabIndex: props.isDisabled || props.isReadOnly ? undefined : 0, ref: stableRef, "aria-invalid": props.isInvalid, "aria-describedby": errorId },
             react_2.default.createElement(react_1.Combobox.Input, { className: (0, cx_1.cx)("uxf-combobox__input"), displayValue: (item) => { var _a; return (_a = item === null || item === void 0 ? void 0 : item.label) !== null && _a !== void 0 ? _a : ""; }, onBlur: props.onBlur, onChange: (event) => setQuery(event.target.value), placeholder: props.placeholder, ref: stableRef, type: "text" }),
             renderProps.open ? (react_2.default.createElement(icon_1.Icon, { Component: icon_1.ChevronUpIcon, size: 12 })) : (react_2.default.createElement(icon_1.Icon, { Component: icon_1.ChevronDownIcon, size: 12 }))),
+        props.helperText && (react_2.default.createElement("div", { className: (0, cx_1.cx)("uxf-helper-text", props.isInvalid && classes_1.CLASSES.IS_INVALID) }, props.helperText)),
         react_2.default.createElement(react_1.Combobox.Options, { className: "uxf-dropdown", ref: dropdown.floating, style: dropdown.style }, filteredData.map((option) => {
             var _a, _b, _c, _d;
             return (react_2.default.createElement(react_1.Combobox.Option, { key: (_b = (_a = props.keyExtractor) === null || _a === void 0 ? void 0 : _a.call(props, option)) !== null && _b !== void 0 ? _b : option.id, value: option, className: (optionState) => (0, cx_1.cx)("uxf-dropdown__item", optionState.active && classes_1.CLASSES.IS_ACTIVE, optionState.disabled && classes_1.CLASSES.IS_DISABLED, optionState.selected && classes_1.CLASSES.IS_SELECTED) }, (_d = (_c = props.renderOption) === null || _c === void 0 ? void 0 : _c.call(props, option)) !== null && _d !== void 0 ? _d : option.label));
-        })),
-        react_2.default.createElement("div", { className: "uxf-combobox__helper-text" }, props.isInvalid && props.error ? props.error : props.helperText)))));
+        }))))));
 }
 exports.default = (0, forwardRef_1.forwardRef)("Combobox", Combobox);

package/form-control/form-control.d.ts

@@ -0,0 +1,13 @@
+import { ReactElement, ReactNode } from "react";
+interface FormControlProps {
+    form?: string;
+    inputId: string;
+    errorId?: string;
+    isRequired?: boolean;
+    className?: string;
+    label?: ReactNode;
+    helperText?: ReactNode;
+    children?: ReactElement;
+}
+export declare function FormControl(props: FormControlProps): JSX.Element;
+export {};

package/form-control/form-control.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormControl = void 0;
+const react_1 = __importDefault(require("react"));
+const label_1 = require("../label");
+const cx_1 = require("@uxf/core/utils/cx");
+const classes_1 = require("@uxf/core/constants/classes");
+// TODO - tohle asi ještě nějak předělám (ten interface je trochu nelogickej)
+function FormControl(props) {
+    const helperTextClassName = (0, cx_1.cx)("uxf-helper-text", props.errorId && classes_1.CLASSES.IS_INVALID);
+    return (react_1.default.createElement("div", { className: props.className },
+        react_1.default.createElement(label_1.Label, { isRequired: props.isRequired, htmlFor: props.inputId, form: props.form }, props.label),
+        props.children,
+        react_1.default.createElement("div", { className: helperTextClassName }, props.helperText)));
+}
+exports.FormControl = FormControl;

package/form-control/form-control.stories.d.ts

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

package/form-control/form-control.stories.js

@@ -0,0 +1,23 @@
+"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 react_1 = __importDefault(require("react"));
+const form_control_1 = require("./form-control");
+exports.default = {
+    title: "UI/FormControl",
+    component: form_control_1.FormControl,
+    parameters: { actions: { argTypesRegex: "^on.*" } },
+};
+function Default() {
+    return (react_1.default.createElement("div", { className: "space-y-4" },
+        react_1.default.createElement(form_control_1.FormControl, { inputId: "default", helperText: "helper text", label: "Default" },
+            react_1.default.createElement("div", null, "Default")),
+        react_1.default.createElement(form_control_1.FormControl, { inputId: "default", helperText: "helper text", label: "Default", isRequired: true },
+            react_1.default.createElement("div", null, "Is required")),
+        react_1.default.createElement(form_control_1.FormControl, { inputId: "error", helperText: "helper text", label: "Default", errorId: "error--error", isRequired: true },
+            react_1.default.createElement("div", null, "Is invalid"))));
+}
+exports.Default = Default;

package/form-control/index.d.ts

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

package/form-control/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-control"), exports);

package/icon/icon.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { IconsSet } from "./theme";
+import { IconsSet } from "@uxf/ui/icon/theme";
 declare type NameOrComponentType = {
     name: IconsSet;
     Component?: never;

package/image-gallery/components/gallery.js

@@ -31,7 +31,9 @@ const previous_button_1 = __importDefault(require("./previous-button"));
 const next_button_1 = __importDefault(require("./next-button"));
 const dot_1 = __importDefault(require("./dot"));
 const react_1 = __importStar(require("react"));
+const resizer_1 = require("@uxf/core/utils/resizer");
 function Gallery(props) {
+    var _a;
     (0, react_1.useEffect)(() => {
         const onKeyDown = (event) => {
             switch (event.key) {
@@ -54,15 +56,16 @@ function Gallery(props) {
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
+    const imageSrc = props.images[props.imageIndex].src;
     return (react_1.default.createElement("div", { className: "fixed inset-0 top-0 bottom-0 z-50 flex flex-col bg-black bg-opacity-75 transition-opacity" },
         react_1.default.createElement("div", { className: "flex justify-end" },
             react_1.default.createElement(close_button_1.default, { onClick: props.onClose })),
         react_1.default.createElement("div", { className: "container mx-auto flex h-full flex-1 flex-col" },
             react_1.default.createElement("div", { className: "relative flex flex-1 items-center justify-center" },
-                react_1.default.createElement("img", { alt: "", className: "absolute left-0 right-0 top-0 h-full w-full object-contain", src: props.images[props.imageIndex].src }),
+                react_1.default.createElement("img", { alt: "", className: "absolute left-0 right-0 top-0 h-full w-full object-contain", src: typeof imageSrc === "string" ? imageSrc : (_a = (0, resizer_1.resizerImageUrl)(imageSrc)) !== null && _a !== void 0 ? _a : "" }),
                 react_1.default.createElement("div", { className: "pointer-events-none absolute inset-0 flex items-center justify-between p-2" },
                     react_1.default.createElement(previous_button_1.default, { onClick: props.onPrevious }),
                     react_1.default.createElement(next_button_1.default, { onClick: props.onNext })))),
-        react_1.default.createElement("div", { className: "row mx-auto flex space-x-2 p-4" }, props.images.map((url, index) => (react_1.default.createElement(dot_1.default, { key: url.src, active: index === props.imageIndex }))))));
+        react_1.default.createElement("div", { className: "row mx-auto flex space-x-2 p-4" }, props.images.map((image, index) => (react_1.default.createElement(dot_1.default, { key: typeof image.src === "string" ? image.src : image.src.uuid, active: index === props.imageIndex }))))));
 }
 exports.default = Gallery;

package/image-gallery/image-gallery.js

@@ -32,9 +32,9 @@ const gallery_1 = __importDefault(require("./components/gallery"));
 function ImageGallery(props) {
     const [images, setImages] = (0, react_1.useState)([]);
     const [imageIndex, setImageIndex] = (0, react_1.useState)(null);
-    const registerImage = (0, react_1.useMemo)(() => (image) => setImages((v) => [...v, image]), []);
-    const unregisterImage = (0, react_1.useMemo)(() => (image) => setImages((v) => v.filter((u) => u.src !== image.src)), []);
-    const openGallery = (image) => setImageIndex(images.findIndex((i) => i.src === image.src));
+    const registerImage = (0, react_1.useCallback)((image) => setImages((v) => [...v, image]), []);
+    const unregisterImage = (0, react_1.useCallback)((image) => setImages((v) => v.filter((u) => u.src !== image.src)), []);
+    const openGallery = (0, react_1.useCallback)((image) => setImageIndex(images.findIndex((i) => i.src === image.src)), [images]);
     const onPrevious = (0, react_1.useCallback)(() => {
         setImageIndex((v) => (v === null ? null : v - 1));
     }, []);

package/image-gallery/image-gallery.stories.js

@@ -21,6 +21,6 @@ const images = [
 ];
 function Default() {
     return (react_1.default.createElement(image_gallery_1.default, null,
-        react_1.default.createElement("div", { className: "flex-direction flex gap-2" }, images.map((src) => (react_1.default.createElement(image_1.default, { key: src, src: src, className: "h-56 w-56 cursor-pointer object-cover transition-transform hover:scale-105" }))))));
+        react_1.default.createElement("div", { className: "flex-direction flex gap-2" }, images.map((src) => (react_1.default.createElement(image_1.default, { key: typeof src === "string" ? src : src.uuid, src: src, className: "h-56 w-56 cursor-pointer object-cover transition-transform hover:scale-105" }))))));
 }
 exports.Default = Default;

package/image-gallery/image.js

@@ -5,8 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const use_image_1 = require("./use-image");
+const resizer_1 = require("@uxf/core/utils/resizer");
 function Image(props) {
+    var _a;
     const openGallery = (0, use_image_1.useImage)(props);
-    return (react_1.default.createElement("img", { src: props.src, alt: props.alt, title: props.title, className: props.className, onClick: () => openGallery(props) }));
+    return (react_1.default.createElement("img", { src: typeof props.src === "string" ? props.src : (_a = (0, resizer_1.resizerImageUrl)(props.src)) !== null && _a !== void 0 ? _a : "", alt: props.alt, title: props.title, className: props.className, onClick: openGallery }));
 }
 exports.default = Image;

package/image-gallery/index.d.ts

@@ -1,3 +1,4 @@
 export { default as Image } from "./image";
 export { default as ImageGallery } from "./image-gallery";
 export * from "./use-image";
+export * from "./types";

package/image-gallery/index.js

@@ -23,3 +23,4 @@ Object.defineProperty(exports, "Image", { enumerable: true, get: function () { r
 var image_gallery_1 = require("./image-gallery");
 Object.defineProperty(exports, "ImageGallery", { enumerable: true, get: function () { return __importDefault(image_gallery_1).default; } });
 __exportStar(require("./use-image"), exports);
+__exportStar(require("./types"), exports);

package/image-gallery/types.d.ts

@@ -1,5 +1,6 @@
+import { FileResponse } from "../utils/image";
 export interface ImageGalleryImageProps {
-    src: string;
+    src: string | FileResponse;
     title?: string;
     alt?: string;
     className?: string;

package/image-gallery/use-image.d.ts

@@ -1,2 +1,2 @@
 import { ImageGalleryImageProps } from "./types";
-export declare function useImage(props: ImageGalleryImageProps): (props: ImageGalleryImageProps) => void;
+export declare function useImage(props: ImageGalleryImageProps): () => void;

package/image-gallery/use-image.js

@@ -11,6 +11,6 @@ function useImage(props) {
             unregisterImage(props);
         };
     }, [props, registerImage, unregisterImage]);
-    return openGallery;
+    return (0, react_1.useCallback)(() => openGallery(props), [props, openGallery]);
 }
 exports.useImage = useImage;

package/label/label.d.ts

@@ -1,10 +1,11 @@
 import React, { MouseEventHandler, ReactNode } from "react";
 export interface LabelProps {
     children?: ReactNode;
+    className?: string;
     htmlFor?: string;
     form?: string;
     onClick?: MouseEventHandler<HTMLLabelElement>;
-    className?: string;
+    isRequired?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<LabelProps & React.RefAttributes<HTMLLabelElement>>;
 export default _default;

package/label/label.js

@@ -7,6 +7,7 @@ const forwardRef_1 = require("@uxf/ui/utils/forwardRef");
 const react_1 = __importDefault(require("react"));
 const cx_1 = require("@uxf/core/utils/cx");
 function Label(props, ref) {
-    return (react_1.default.createElement("label", { className: (0, cx_1.cx)("uxf-label", props.className), ref: ref, htmlFor: props.htmlFor, form: props.form, onClick: props.onClick }, props.children));
+    const className = (0, cx_1.cx)("uxf-label", props.isRequired && "is-required", props.className);
+    return (react_1.default.createElement("label", { className: className, ref: ref, htmlFor: props.htmlFor, form: props.form, onClick: props.onClick }, props.children));
 }
 exports.default = (0, forwardRef_1.forwardRef)("Label", Label);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/ui",
-  "version": "1.0.0-beta.35",
+  "version": "1.0.0-beta.37",
   "description": "",
   "publishConfig": {
     "access": "public"

package/radio/radio.d.ts

@@ -1,11 +1,5 @@
 import React from "react";
-export interface RadioProps {
-    active?: boolean;
-    checked?: boolean;
-    disabled?: boolean;
-    invalid?: boolean;
-    label: string;
-    className?: string;
-}
+import { FormControlProps } from "../types";
+export declare type RadioProps = FormControlProps<boolean>;
 declare const _default: React.ForwardRefExoticComponent<RadioProps & React.RefAttributes<HTMLDivElement>>;
 export default _default;

package/radio/radio.js

@@ -8,11 +8,7 @@ const cx_1 = require("@uxf/core/utils/cx");
 const react_1 = __importDefault(require("react"));
 const forwardRef_1 = require("../utils/forwardRef");
 function Radio(props, ref) {
-    // eslint-disable-next-line react/destructuring-assignment
-    const { active, checked, className, disabled, invalid, label, ...restProps } = props;
-    return (react_1.default.createElement("div", { className: (0, cx_1.cx)("uxf-radio__control", active && classes_1.CLASSES.IS_FOCUSED, checked && classes_1.CLASSES.IS_SELECTED, disabled && classes_1.CLASSES.IS_DISABLED, invalid && classes_1.CLASSES.IS_INVALID, className), ref: ref, ...restProps },
-        react_1.default.createElement("div", { className: (0, cx_1.cx)("uxf-radio", active && classes_1.CLASSES.IS_FOCUSED, checked && classes_1.CLASSES.IS_SELECTED, disabled && classes_1.CLASSES.IS_DISABLED, invalid && classes_1.CLASSES.IS_INVALID) },
-            react_1.default.createElement("div", { className: (0, cx_1.cx)(checked && classes_1.CLASSES.IS_SELECTED, "uxf-radio__inner") })),
-        react_1.default.createElement("p", { className: "cursor-default" }, label)));
+    return (react_1.default.createElement("div", { ref: ref, className: (0, cx_1.cx)("uxf-radio", props.value && classes_1.CLASSES.IS_SELECTED, props.isDisabled && classes_1.CLASSES.IS_DISABLED, props.isInvalid && classes_1.CLASSES.IS_INVALID, props.isReadOnly && classes_1.CLASSES.IS_READONLY), onClick: () => { var _a; return (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, !props.value); } },
+        react_1.default.createElement("div", { className: "uxf-radio__inner" })));
 }
 exports.default = (0, forwardRef_1.forwardRef)("Radio", Radio);

package/radio/radio.stories.js

@@ -11,10 +11,18 @@ exports.default = {
     component: index_1.Radio,
 };
 function Default() {
-    return (react_1.default.createElement("div", { className: "space-y-2" },
-        react_1.default.createElement(index_1.Radio, { label: "Radio", checked: true, active: true }),
-        react_1.default.createElement(index_1.Radio, { label: "Radio", checked: true, active: false }),
-        react_1.default.createElement(index_1.Radio, { label: "Radio", checked: false, active: true }),
-        react_1.default.createElement(index_1.Radio, { label: "Radio", checked: false, active: false })));
+    return (react_1.default.createElement("div", null,
+        react_1.default.createElement("div", { className: "mt-4 mb-2 font-semibold" }, "Default"),
+        react_1.default.createElement("div", { className: "flex flex-row gap-4" },
+            react_1.default.createElement(index_1.Radio, { value: false }),
+            react_1.default.createElement(index_1.Radio, { value: true })),
+        react_1.default.createElement("div", { className: "mt-4 mb-2 font-semibold" }, "Invalid"),
+        react_1.default.createElement("div", { className: "flex flex-row gap-4" },
+            react_1.default.createElement(index_1.Radio, { value: false, isInvalid: true }),
+            react_1.default.createElement(index_1.Radio, { value: true, isInvalid: true })),
+        react_1.default.createElement("div", { className: "mt-4 mb-2 font-semibold" }, "Disabled"),
+        react_1.default.createElement("div", { className: "flex flex-row gap-4" },
+            react_1.default.createElement(index_1.Radio, { value: false, isDisabled: true }),
+            react_1.default.createElement(index_1.Radio, { value: true, isDisabled: true }))));
 }
 exports.Default = Default;

package/radio-group/radio-group.js

@@ -39,7 +39,7 @@ function RadioGroup(props, ref) {
     const errorId = invalid ? `${id}--errormessage` : undefined;
     return (react_1.default.createElement(react_2.RadioGroup, { className: `_form-field ${className || ""}`, disabled: disabled, id: id, value: value, onChange: onChange, style: style },
         !hiddenLabel && (react_1.default.createElement(react_2.RadioGroup.Label, { as: label_1.Label, className: "mb-2" }, label)),
-        react_1.default.createElement("div", { className: `flex ${forceColumn ? "flex-col" : "flex-wrap items-center"} focus-visible:ring-gray-dark outline-none focus-visible:ring-2`, onBlur: onBlur, onFocus: onFocus, ref: (0, composeRefs_1.composeRefs)(innerRef, ref), tabIndex: disabled ? -1 : 0 }, options.map((option) => (react_1.default.createElement(react_2.RadioGroup.Option, { as: react_1.Fragment, disabled: option.disabled, key: option.value.toString(), value: option.value }, (o) => (react_1.default.createElement(radio_1.Radio, { active: o.active, checked: o.checked, disabled: disabled || o.disabled, invalid: invalid, label: option.label })))))),
+        react_1.default.createElement("div", { className: `flex ${forceColumn ? "flex-col" : "flex-wrap items-center"} focus-visible:ring-gray-dark outline-none focus-visible:ring-2`, onBlur: onBlur, onFocus: onFocus, ref: (0, composeRefs_1.composeRefs)(innerRef, ref), tabIndex: disabled ? -1 : 0 }, options.map((option) => (react_1.default.createElement(react_2.RadioGroup.Option, { as: react_1.Fragment, disabled: option.disabled, key: option.value.toString(), value: option.value }, (o) => react_1.default.createElement(radio_1.Radio, { value: o.checked, isDisabled: disabled || o.disabled, isInvalid: invalid }))))),
         invalid && error && react_1.default.createElement(error_message_1.ErrorMessage, { id: errorId }, error)));
 }
 exports.default = (0, forwardRef_1.forwardRef)("RadioGroup", RadioGroup);

package/select/select.js

@@ -47,9 +47,8 @@ function Select(props, ref) {
         react_2.default.createElement(react_1.Listbox.Label, { as: label_1.Label, onClick: props.isDisabled || props.isReadOnly ? undefined : input.focus }, props.label),
         react_2.default.createElement(react_1.Listbox.Button, { as: "div", className: (0, cx_1.cx)("uxf-select__button", (renderProps.open || input.focused) && classes_1.CLASSES.IS_FOCUSED, renderProps.disabled && classes_1.CLASSES.IS_DISABLED, props.isReadOnly && classes_1.CLASSES.IS_READONLY, props.isInvalid && classes_1.CLASSES.IS_INVALID), onBlur: input.onBlur, onFocus: input.onFocus, tabIndex: props.isDisabled || props.isReadOnly ? undefined : 0, ref: stableRef, "aria-invalid": props.isInvalid, "aria-describedby": errorId },
             react_2.default.createElement("div", { className: "uxf-select__button-text" }, (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label) || props.placeholder),
-            renderProps.open ? (react_2.default.createElement(icon_1.Icon, { Component: icon_1.ChevronUpIcon, size: 12 })) : (react_2.default.createElement(icon_1.Icon, { Component: icon_1.ChevronDownIcon, size: 12 })),
-            " "),
-        react_2.default.createElement("div", { className: "uxf-select__helper-text" }, props.helperText),
+            renderProps.open ? (react_2.default.createElement(icon_1.Icon, { Component: icon_1.ChevronUpIcon, size: 12 })) : (react_2.default.createElement(icon_1.Icon, { Component: icon_1.ChevronDownIcon, size: 12 }))),
+        props.helperText && (react_2.default.createElement("div", { className: (0, cx_1.cx)("uxf-helper-text", props.isInvalid && classes_1.CLASSES.IS_INVALID) }, props.helperText)),
         react_2.default.createElement(react_1.Listbox.Options, { ref: dropdown.floating, style: dropdown.style, className: "uxf-dropdown" }, props.options.map((option) => {
             var _a, _b, _c, _d;
             return (react_2.default.createElement(react_1.Listbox.Option, { key: (_b = (_a = props.keyExtractor) === null || _a === void 0 ? void 0 : _a.call(props, option)) !== null && _b !== void 0 ? _b : option.id, value: option, className: (optionState) => (0, cx_1.cx)("uxf-dropdown__item", optionState.active && classes_1.CLASSES.IS_ACTIVE, optionState.disabled && classes_1.CLASSES.IS_DISABLED, optionState.selected && classes_1.CLASSES.IS_SELECTED) }, (_d = (_c = props.renderOption) === null || _c === void 0 ? void 0 : _c.call(props, option)) !== null && _d !== void 0 ? _d : option.label));

package/text-input/text-input.js

@@ -27,13 +27,15 @@ exports.TextInput = void 0;
 const input_1 = require("@uxf/ui/input");
 const react_1 = __importStar(require("react"));
 const cx_1 = require("@uxf/core/utils/cx");
+const form_control_1 = require("../form-control");
+const classes_1 = require("@uxf/core/constants/classes");
 function TextInput(props) {
     var _a;
     const [isFocused, setIsFocused] = (0, react_1.useState)(false);
     const generatedId = (0, react_1.useId)();
     const id = (_a = props.id) !== null && _a !== void 0 ? _a : generatedId;
     const errorId = props.isInvalid ? `${id}--error-message` : undefined;
-    const rootClassName = (0, cx_1.cx)("uxf-text-input", props.isInvalid && "uxf-text-input--invalid", props.isDisabled && "uxf-text-input--disabled", props.isRequired && "uxf-text-input--required", isFocused && "uxf-text-input--focused");
+    const rootClassName = (0, cx_1.cx)("uxf-text-input", props.isInvalid && classes_1.CLASSES.IS_INVALID, props.isDisabled && classes_1.CLASSES.IS_DISABLED, props.isRequired && "is-required", isFocused && classes_1.CLASSES.IS_FOCUSED);
     const onFocus = (e) => {
         var _a;
         setIsFocused(true);
@@ -44,14 +46,12 @@ function TextInput(props) {
         setIsFocused(false);
         (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     };
-    return (react_1.default.createElement("div", { className: rootClassName },
-        react_1.default.createElement("label", { className: "uxf-text-input__label", htmlFor: id }, props.label),
+    return (react_1.default.createElement(form_control_1.FormControl, { inputId: id, errorId: errorId, className: rootClassName, isRequired: props.isRequired, helperText: props.helperText, label: props.label, form: props.form },
         react_1.default.createElement(input_1.Input, { size: props.size, variant: props.variant },
             props.leftAddon && react_1.default.createElement(input_1.Input.LeftAddon, null, props.leftAddon),
             props.leftElement && react_1.default.createElement(input_1.Input.LeftElement, null, props.leftElement),
             react_1.default.createElement(input_1.Input.Element, { id: id, name: props.name, value: props.value, onChange: props.onChange, onFocus: onFocus, onBlur: onBlur, isInvalid: props.isInvalid, isRequired: props.isRequired, isReadOnly: props.isReadOnly, isDisabled: props.isDisabled, placeholder: props.placeholder, "aria-describedby": errorId, type: props.type }),
             props.rightElement && react_1.default.createElement(input_1.Input.RightElement, null, props.rightElement),
-            props.rightAddon && react_1.default.createElement(input_1.Input.RightAddon, null, props.rightAddon)),
-        react_1.default.createElement("div", { className: "uxf-text-input__helper-text", id: errorId }, props.helperText)));
+            props.rightAddon && react_1.default.createElement(input_1.Input.RightAddon, null, props.rightAddon))));
 }
 exports.TextInput = TextInput;