Skip to content
Merged
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
16 changes: 13 additions & 3 deletions src/Highlight.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type HighlightProps = {
id?: string;
className?: string;
classes?: Partial<Record<"root" | "content", string>>;
bodyAs?: "p" | "div";
size?: HighlightProps.Size;
style?: CSSProperties;
children: NonNullable<ReactNode>;
Expand All @@ -22,7 +23,16 @@ export namespace HighlightProps {
/** @see <https://components.react-dsfr.codegouv.studio/?path=/docs/components-highlight> */
export const Highlight = memo(
forwardRef<HTMLDivElement, HighlightProps>((props, ref) => {
const { className, classes = {}, style, children, size, id: id_props, ...rest } = props;
const {
className,
classes = {},
style,
children,
bodyAs: HtmlBodyTag = "p",
size,
id: id_props,
...rest
} = props;

assert<Equals<keyof typeof rest, never>>();

Expand All @@ -39,9 +49,9 @@ export const Highlight = memo(
style={style}
{...rest}
>
<p className={cx(fr.cx({ [`fr-text--${size}`]: size }), classes.content)}>
<HtmlBodyTag className={cx(fr.cx({ [`fr-text--${size}`]: size }), classes.content)}>
{children}
</p>
</HtmlBodyTag>
</div>
);
})
Expand Down
13 changes: 13 additions & 0 deletions test/integration/vite/src/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Alert } from "@codegouvfr/react-dsfr/Alert";
import { Button } from "@codegouvfr/react-dsfr/Button";
import { ButtonsGroup } from "@codegouvfr/react-dsfr/ButtonsGroup";
import { Highlight } from "@codegouvfr/react-dsfr/Highlight";

import { Input } from "@codegouvfr/react-dsfr/Input";
import { Select } from "@codegouvfr/react-dsfr/SelectNext";
Expand Down Expand Up @@ -80,6 +81,9 @@ export function Home() {
<TileExample />
<TableExample />
<ControlledAccordion />
<div className={fr.cx("fr-my-4w")}>
<HighlightExample />
</div>
</>
);
}
Expand Down Expand Up @@ -252,3 +256,12 @@ function ControlledAccordion() {
</Accordion>
);
}

function HighlightExample() {
return (
<Highlight
children={`Les parents d’enfants de 11 à 14 ans n’ont aucune démarche à accomplir : les CAF versent automatiquement l’ARS aux familles déjà allocataires qui remplissent les conditions.`}
bodyAs="p"
/>
)
}