@ttoss/forms 0.18.8 → 0.18.10

package/dist/esm/index.js

@@ -236,7 +236,7 @@ var FormFieldCheckbox = ({
 };
 
 // src/FormFieldInput.tsx
-import { Input } from "@ttoss/ui/src";
+import { Input } from "@ttoss/ui";
 import { jsx as jsx5 } from "react/jsx-runtime";
 var FormFieldInput = ({
   label,
@@ -257,13 +257,12 @@ var FormFieldInput = ({
     defaultValue,
     render: ({
       field,
-      formState
+      fieldState
     }) => {
-      const hasError = !!formState.errors[name]?.message;
       return /* @__PURE__ */jsx5(Input, {
         ...inputProps,
         ...field,
-        "aria-invalid": hasError.valueOf()
+        "aria-invalid": fieldState.error ? "true" : void 0
       });
     }
   });
@@ -291,13 +290,12 @@ var FormFieldPassword = ({
     defaultValue,
     render: ({
       field,
-      formState
+      fieldState
     }) => {
-      const hasError = !!formState.errors[name]?.message;
       return /* @__PURE__ */jsx6(InputPassword, {
         ...inputProps,
         ...field,
-        "aria-invalid": hasError.valueOf()
+        "aria-invalid": fieldState.error ? "true" : void 0
       });
     }
   });
@@ -451,11 +449,13 @@ var FormFieldTextarea = ({
     id,
     sx,
     render: ({
-      field
+      field,
+      fieldState
     }) => {
       return /* @__PURE__ */jsx9(Textarea, {
         ...field,
-        ...textareaProps
+        ...textareaProps,
+        "aria-invalid": fieldState.error ? "true" : void 0
       });
     }
   });

package/dist/index.d.ts

@@ -6,8 +6,7 @@ import * as yup from 'yup';
 export { yup };
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as React from 'react';
-import { BoxProps, FlexProps, CheckboxProps, InputPasswordProps, RadioProps, SelectProps, TextareaProps } from '@ttoss/ui';
-import { InputProps } from '@ttoss/ui/src';
+import { BoxProps, FlexProps, CheckboxProps, InputProps, InputPasswordProps, RadioProps, SelectProps, TextareaProps } from '@ttoss/ui';
 
 declare const Form: <TFieldValues extends FieldValues = FieldValues>({ children, onSubmit, sx, ...formMethods }: {
     children?: React.ReactNode;

package/dist/index.js

@@ -272,7 +272,7 @@ var FormFieldCheckbox = ({
 };
 
 // src/FormFieldInput.tsx
-var import_src = require("@ttoss/ui/src");
+var import_ui5 = require("@ttoss/ui");
 var import_jsx_runtime5 = require("react/jsx-runtime");
 var FormFieldInput = ({
   label,
@@ -293,20 +293,19 @@ var FormFieldInput = ({
     defaultValue,
     render: ({
       field,
-      formState
+      fieldState
     }) => {
-      const hasError = !!formState.errors[name]?.message;
-      return /* @__PURE__ */(0, import_jsx_runtime5.jsx)(import_src.Input, {
+      return /* @__PURE__ */(0, import_jsx_runtime5.jsx)(import_ui5.Input, {
         ...inputProps,
         ...field,
-        "aria-invalid": hasError.valueOf()
+        "aria-invalid": fieldState.error ? "true" : void 0
       });
     }
   });
 };
 
 // src/FormFieldPassword.tsx
-var import_ui5 = require("@ttoss/ui");
+var import_ui6 = require("@ttoss/ui");
 var import_jsx_runtime6 = require("react/jsx-runtime");
 var FormFieldPassword = ({
   label,
@@ -327,20 +326,19 @@ var FormFieldPassword = ({
     defaultValue,
     render: ({
       field,
-      formState
+      fieldState
     }) => {
-      const hasError = !!formState.errors[name]?.message;
-      return /* @__PURE__ */(0, import_jsx_runtime6.jsx)(import_ui5.InputPassword, {
+      return /* @__PURE__ */(0, import_jsx_runtime6.jsx)(import_ui6.InputPassword, {
         ...inputProps,
         ...field,
-        "aria-invalid": hasError.valueOf()
+        "aria-invalid": fieldState.error ? "true" : void 0
       });
     }
   });
 };
 
 // src/FormFieldRadio.tsx
-var import_ui6 = require("@ttoss/ui");
+var import_ui7 = require("@ttoss/ui");
 var import_react_hook_form5 = require("react-hook-form");
 var import_jsx_runtime7 = require("react/jsx-runtime");
 var FormFieldRadio = ({
@@ -361,23 +359,23 @@ var FormFieldRadio = ({
     name,
     defaultValue: ""
   });
-  return /* @__PURE__ */(0, import_jsx_runtime7.jsxs)(import_ui6.Flex, {
+  return /* @__PURE__ */(0, import_jsx_runtime7.jsxs)(import_ui7.Flex, {
     sx: {
       flexDirection: "column",
       width: "100%",
       ...sx
     },
-    children: [label && /* @__PURE__ */(0, import_jsx_runtime7.jsx)(import_ui6.Label, {
+    children: [label && /* @__PURE__ */(0, import_jsx_runtime7.jsx)(import_ui7.Label, {
       sx: {
         marginBottom: "md"
       },
       children: label
-    }), /* @__PURE__ */(0, import_jsx_runtime7.jsx)(import_ui6.Box, {
+    }), /* @__PURE__ */(0, import_jsx_runtime7.jsx)(import_ui7.Box, {
       children: options.map(option => {
         const id = `form-field-radio-${name}-${option.value}`;
-        return /* @__PURE__ */(0, import_jsx_runtime7.jsxs)(import_ui6.Label, {
+        return /* @__PURE__ */(0, import_jsx_runtime7.jsxs)(import_ui7.Label, {
           htmlFor: id,
-          children: [/* @__PURE__ */(0, import_jsx_runtime7.jsx)(import_ui6.Radio, {
+          children: [/* @__PURE__ */(0, import_jsx_runtime7.jsx)(import_ui7.Radio, {
             ref,
             onChange,
             onBlur,
@@ -396,7 +394,7 @@ var FormFieldRadio = ({
 };
 
 // src/FormFieldSelect.tsx
-var import_ui7 = require("@ttoss/ui");
+var import_ui8 = require("@ttoss/ui");
 var import_jsx_runtime8 = require("react/jsx-runtime");
 var checkDefaultValue = ({
   options,
@@ -452,7 +450,7 @@ var FormFieldSelect = ({
       field,
       fieldState
     }) => {
-      return /* @__PURE__ */(0, import_jsx_runtime8.jsx)(import_ui7.Select, {
+      return /* @__PURE__ */(0, import_jsx_runtime8.jsx)(import_ui8.Select, {
         ...selectProps,
         ...field,
         ...{
@@ -472,7 +470,7 @@ var FormFieldSelect = ({
 };
 
 // src/FormFieldTextarea.tsx
-var import_ui8 = require("@ttoss/ui");
+var import_ui9 = require("@ttoss/ui");
 var import_jsx_runtime9 = require("react/jsx-runtime");
 var FormFieldTextarea = ({
   label,
@@ -487,11 +485,13 @@ var FormFieldTextarea = ({
     id,
     sx,
     render: ({
-      field
+      field,
+      fieldState
     }) => {
-      return /* @__PURE__ */(0, import_jsx_runtime9.jsx)(import_ui8.Textarea, {
+      return /* @__PURE__ */(0, import_jsx_runtime9.jsx)(import_ui9.Textarea, {
         ...field,
-        ...textareaProps
+        ...textareaProps,
+        "aria-invalid": fieldState.error ? "true" : void 0
       });
     }
   });
@@ -499,7 +499,7 @@ var FormFieldTextarea = ({
 
 // src/FormGroup.tsx
 var React3 = __toESM(require("react"));
-var import_ui9 = require("@ttoss/ui");
+var import_ui10 = require("@ttoss/ui");
 var import_jsx_runtime10 = require("react/jsx-runtime");
 var FormGroupLevelsManagerContext = React3.createContext({
   levelsLength: 1,
@@ -559,7 +559,7 @@ var FormGroupWrapper = ({
     gap: "md",
     width: "100%"
   };
-  return /* @__PURE__ */(0, import_jsx_runtime10.jsxs)(import_ui9.Box, {
+  return /* @__PURE__ */(0, import_jsx_runtime10.jsxs)(import_ui10.Box, {
     "aria-level": level,
     ...boxProps,
     sx: {
@@ -567,18 +567,18 @@ var FormGroupWrapper = ({
       marginBottom: "lg",
       ...boxProps.sx
     },
-    children: [title && /* @__PURE__ */(0, import_jsx_runtime10.jsx)(import_ui9.Box, {
+    children: [title && /* @__PURE__ */(0, import_jsx_runtime10.jsx)(import_ui10.Box, {
       sx: {
         marginBottom: "md"
       },
-      children: /* @__PURE__ */(0, import_jsx_runtime10.jsx)(import_ui9.Text, {
+      children: /* @__PURE__ */(0, import_jsx_runtime10.jsx)(import_ui10.Text, {
         sx: {
           fontSize: "2xl",
           fontWeight: "bold"
         },
         children: title
       })
-    }), /* @__PURE__ */(0, import_jsx_runtime10.jsx)(import_ui9.Flex, {
+    }), /* @__PURE__ */(0, import_jsx_runtime10.jsx)(import_ui10.Flex, {
       sx: childrenContainerSx,
       children
     })]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/forms",
-  "version": "0.18.8",
+  "version": "0.18.10",
   "license": "UNLICENSED",
   "author": "ttoss",
   "contributors": [

package/src/FormFieldInput.tsx

@@ -1,6 +1,6 @@
 import { FieldPath, FieldPathValue, FieldValues } from 'react-hook-form';
 import { FormField, type FormFieldProps } from './FormField';
-import { Input, type InputProps } from '@ttoss/ui/src';
+import { Input, type InputProps } from '@ttoss/ui';
 
 export type FormFieldInputProps<TName> = {
   label?: string;
@@ -29,11 +29,13 @@ export const FormFieldInput = <
       onTooltipClick={onTooltipClick}
       sx={sx}
       defaultValue={defaultValue as FieldPathValue<TFieldValues, TName>}
-      render={({ field, formState }) => {
-        const hasError = !!formState.errors[name]?.message;
-
+      render={({ field, fieldState }) => {
         return (
-          <Input {...inputProps} {...field} aria-invalid={hasError.valueOf()} />
+          <Input
+            {...inputProps}
+            {...field}
+            aria-invalid={fieldState.error ? 'true' : undefined}
+          />
         );
       }}
     />

package/src/FormFieldPassword.tsx

@@ -29,14 +29,12 @@ export const FormFieldPassword = <
       onTooltipClick={onTooltipClick}
       sx={sx}
       defaultValue={defaultValue as FieldPathValue<TFieldValues, TName>}
-      render={({ field, formState }) => {
-        const hasError = !!formState.errors[name]?.message;
-
+      render={({ field, fieldState }) => {
         return (
           <InputPassword
             {...inputProps}
             {...field}
-            aria-invalid={hasError.valueOf()}
+            aria-invalid={fieldState.error ? 'true' : undefined}
           />
         );
       }}

package/src/FormFieldTextarea.tsx

@@ -22,8 +22,14 @@ export const FormFieldTextarea = <
       name={name}
       id={id}
       sx={sx}
-      render={({ field }) => {
-        return <Textarea {...field} {...textareaProps} />;
+      render={({ field, fieldState }) => {
+        return (
+          <Textarea
+            {...field}
+            {...textareaProps}
+            aria-invalid={fieldState.error ? 'true' : undefined}
+          />
+        );
       }}
     />
   );