Skip to content

fix(description) - help center links #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrielseco wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(description) - help center links #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af5c5ee
fix(description) - help center links
gabrielseco Jan 31, 2026
7489372
fix description
gabrielseco Jan 31, 2026
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
6 changes: 4 additions & 2 deletions src/components/form/fields/default/RadioGroupFieldDefault.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ export const RadioGroupFieldDefault = ({
<FormItem>
<legend>{label}</legend>
{description && (
<FormDescription>
{description} <HelpCenter helpCenter={fieldData.meta?.helpCenter} />
<FormDescription
helpCenter={<HelpCenter helpCenter={fieldData.meta?.helpCenter} />}
>
{description}
</FormDescription>
)}
<FormControl>
Expand Down
4 changes: 3 additions & 1 deletion src/components/form/fields/tests/CurrencyConversionField.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,9 @@ describe('CurrencyFieldWithConversion', () => {
const descriptionElement = screen.getByText(
/Enter your test salary/i,
).parentElement;
expect(descriptionElement).toHaveClass('CustomPrefix-description');
expect(descriptionElement?.parentElement).toHaveClass(
'CustomPrefix-description',
);
});

it('resets conversion field when source currency changes', async () => {
Expand Down
25 changes: 15 additions & 10 deletions src/components/ui/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,29 +131,33 @@ const FormControl = React.forwardRef<
FormControl.displayName = 'FormControl';

function FormDescription<T extends React.ElementType = 'p'>({
helpCenter,
className,
children,
as,
...props
}: React.ComponentProps<'p'> & {
children?: React.ReactNode | (() => React.ReactNode);
as?: T;
helpCenter?: React.ReactNode;
} & Omit<React.ComponentPropsWithoutRef<T>, 'children' | 'className'>) {
const { formDescriptionId } = useFormField();
const Component = as || 'p';

if (typeof children === 'string') {
return (
<Component
data-slot='form-description'
id={formDescriptionId}
className={cn('text-base-color text-xs', className)}
dangerouslySetInnerHTML={{
__html: sanitizeHtml(children),
}}
data-sanitized='true'
{...props}
/>
<>
<Component
data-slot='form-description'
id={formDescriptionId}
className={cn('text-base-color text-xs', className)}
data-sanitized='true'
{...props}
>
<span dangerouslySetInnerHTML={{ __html: sanitizeHtml(children) }} />{' '}
{helpCenter && helpCenter}
</Component>
</>
);
}

Expand All @@ -166,6 +170,7 @@ function FormDescription<T extends React.ElementType = 'p'>({
{...props}
>
{typeof children === 'function' ? children() : children}
{helpCenter && helpCenter}
</Component>
);
}
Expand Down
Loading