Skip to content
This repository was archived by the owner on Oct 14, 2026. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/ErrorMessage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@ import { render } from '@testing-library/react';
import { ErrorMessage } from './ErrorMessage';

describe('ErrorMessage', () => {
it.each([
'span' as const,
({ children }: { children: React.ReactNode }) => (
<strong>{children}</strong>
),
])('uses as before render for %s', (as) => {
const renderMessage = jest.fn(() => <em>wrong renderer</em>);
const { container } = render(
<ErrorMessage
as={as}
errors={{ test: { type: 'required', message: 'Required' } }}
name="test"
render={renderMessage}
/>,
);
expect(container.textContent).toBe('Required');
expect(container.querySelector('span, strong')).not.toBeNull();
expect(renderMessage).not.toHaveBeenCalled();
});

it('should render correctly', () => {
const { asFragment } = render(<ErrorMessage name="test" errors={{}} />);

Expand Down
7 changes: 6 additions & 1 deletion src/ErrorMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,17 @@ const ErrorMessage = <

return React.isValidElement(as)
? React.cloneElement(as, props)
: as
? React.createElement(
as as React.ComponentType<any> | keyof JSX.IntrinsicElements,
props,
)
: render
? (render({
message: messageFromRegister || message,
messages: types,
}) as React.ReactElement)
: React.createElement((as as string) || React.Fragment, props);
: React.createElement(React.Fragment, props);
};

export { ErrorMessage };
4 changes: 3 additions & 1 deletion src/__snapshots__/ErrorMessage.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ exports[`ErrorMessage should render correctly with flat errors and as with compo

exports[`ErrorMessage should render correctly with flat errors and as with component and render 1`] = `
<DocumentFragment>
flat
<div>
flat
</div>
</DocumentFragment>
`;

Expand Down