Skip to content

Commit 100f963

Browse files
authored
fix: allows root message display on FormFieldError (#559)
1 parent 4d17d56 commit 100f963

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"@faker-js/faker": "8.4.1",
5454
"@fontsource/inter": "5.0.19",
5555
"@hookform/resolvers": "3.9.0",
56-
"@oslojs/crypto": "^1.0.1",
57-
"@oslojs/encoding": "^1.1.0",
56+
"@oslojs/crypto": "1.0.1",
57+
"@oslojs/encoding": "1.1.0",
5858
"@prisma/client": "5.16.2",
5959
"@react-email/components": "0.0.21",
6060
"@react-email/render": "0.0.16",

pnpm-lock.yaml

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/Form/FormFieldError.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ const FormFieldErrorComponent = <
5454
}
5555

5656
const error = get<FieldErrors<TFieldValues>>(errors, name);
57+
const errorMessage = error?.root?.message ?? error?.message;
5758

58-
if (!error) {
59+
if (!errorMessage) {
5960
return null;
6061
}
6162

@@ -81,7 +82,7 @@ const FormFieldErrorComponent = <
8182
<SlideFade in offsetY={-6}>
8283
<Flex fontSize="sm" color="error.500" ref={ref} {...rest}>
8384
<Icon icon={LuAlertCircle} me="2" />
84-
{!!error?.message && <span>{error.message}</span>}
85+
<span>{errorMessage}</span>
8586
</Flex>
8687
</SlideFade>
8788
);

0 commit comments

Comments
 (0)