Merge branch 'main' of https://github.com/codegouvfr/react-dsfr

codegouvfr · Jul 25, 2023 · 7291c33 · 7291c33
2 parents 8485cd3 + 3bc5467
commit 7291c33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@codegouvfr/react-dsfr",
-    "version": "0.72.4",
+    "version": "0.73.0",
     "description": "French State Design System React integration library",
     "repository": {
         "type": "git",

diff --git a/src/Alert.tsx b/src/Alert.tsx
@@ -108,6 +108,7 @@ export const Alert = memo(
 
         const refShouldButtonGetFocus = useRef(false);
         const refShouldSetRole = useRef(false);
+        const DescriptionTag = typeof description === "string" ? "p" : "div";
 
         useEffect(() => {
             if (props_isClosed === undefined) {
@@ -172,7 +173,7 @@ export const Alert = memo(
                         {title}
                     </HtmlTitleTag>
                 )}
-                <p className={classes.description}>{description}</p>
+                <DescriptionTag className={classes.description}>{description}</DescriptionTag>
                 {isClosable && (
                     <button
                         ref={setButtonElement}

diff --git a/src/shared/Fieldset.tsx b/src/shared/Fieldset.tsx
@@ -181,15 +181,15 @@ export const Fieldset = memo(
                                 }
                             })()}
                             className={fr.cx(
+                                "fr-message",
                                 (() => {
                                     switch (state) {
                                         case "error":
-                                            return "fr-error-text";
+                                            return "fr-message--error";
                                         case "success":
-                                            return "fr-valid-text";
+                                            return "fr-message--valid";
                                     }
-                                })(),
-                                "fr-message"
+                                })()
                             )}
                         >
                             {stateRelatedMessage}