Merge pull request #113 from InseeFr/develop

fix: roundabout unnecessary and wrong for on suggester
InseeFr · Oct 18, 2023 · a87d34b · a87d34b
2 parents a08e2eb + 2fb105e
commit a87d34b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@inseefr/lunatic-dsfr",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Couche graphique pour Lunatic reposant sur le Système de Design de l'État (DSFR)",
     "repository": {
         "type": "git",

diff --git a/src/Roundabout/roundabout-it-title.tsx b/src/Roundabout/roundabout-it-title.tsx
@@ -1,20 +1,12 @@
 import classnames from "classnames";
-import { useColors } from "@codegouvfr/react-dsfr/useColors";
 import { useStyles } from "tss-react/dsfr";
 import { fr } from "@codegouvfr/react-dsfr";
 
 function UnnecessaryText({ unnecessary }: { unnecessary?: string | boolean }) {
-    const theme = useColors();
-
     if (unnecessary) {
         return (
             <div className={fr.cx("fr-col-12", "fr-mt-1w")}>
-                <p
-                    className={fr.cx("fr-mb-0")}
-                    style={{ color: theme.decisions.text.disabled.grey.default }}
-                >
-                    {unnecessary}
-                </p>
+                <p className={fr.cx("fr-mb-0")}>{unnecessary}</p>
             </div>
         );
     }
@@ -28,7 +20,6 @@ export function RoundaboutItTitle({
     label: string;
     unnecessary?: string | boolean;
 }) {
-    const theme = useColors();
     const { css } = useStyles();
 
     return (
@@ -46,10 +37,7 @@ export function RoundaboutItTitle({
         >
             <div className={fr.cx("fr-grid-row")}>
                 <div className={fr.cx("fr-col-12")}>
-                    <h2
-                        className={classnames("roundabout-it-title", fr.cx("fr-h4", "fr-mb-0"))}
-                        style={unnecessary ? { color: theme.decisions.text.disabled.grey.default } : {}}
-                    >
+                    <h2 className={classnames("roundabout-it-title", fr.cx("fr-h4", "fr-mb-0"))}>
                         {label}
                     </h2>
                 </div>

diff --git a/src/Suggester/elements/Label.tsx b/src/Suggester/elements/Label.tsx
@@ -5,7 +5,6 @@ import { fr } from "@codegouvfr/react-dsfr";
 
 type Props = PropsWithChildren<{
     id?: string;
-    htmlFor?: string;
     className?: string;
     style?: CSSProperties;
     description?: ReactNode | Array<{ label: ReactNode; declarationType: string }>;
@@ -45,11 +44,10 @@ function Description({ value, className }: DescriptionProps) {
     return <OneDescription value={value} className={classnames(className)} />;
 }
 
-export function Label({ children, id, htmlFor, className, style, description }: Props) {
+export function Label({ children, id, className, style, description }: Props) {
     if (children) {
         return (
             <label
-                htmlFor={htmlFor}
                 id={id}
                 className={classnames("lunatic-dsfr-label", fr.cx("fr-label", "fr-mb-1w"), className)}
                 style={style}