Skip to content

Commit c74863e

Browse files
committed
Merge branch 'main' into next_15_support
2 parents 3622dd2 + 310f1e3 commit c74863e

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@codegouvfr/react-dsfr",
3-
"version": "1.20.2",
3+
"version": "1.20.4",
44
"description": "French State Design System React integration library",
55
"repository": {
66
"type": "git",

src/SideMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export const SideMenu = memo(
9191
{...rest}
9292
ref={ref}
9393
style={style}
94-
aria-labelledby={titleId}
94+
{...(title !== undefined && { "aria-labelledby": titleId })}
9595
className={cx(
9696
fr.cx("fr-sidemenu", {
9797
"fr-sidemenu--right": align === "right",

src/Tile.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,12 @@ export const Tile = memo(
174174
</HtmlTitleTag>
175175

176176
{desc !== undefined && (
177-
<p className={cx(fr.cx("fr-tile__desc"), classes.desc)}>{desc}</p>
177+
<div className={cx(fr.cx("fr-tile__desc"), classes.desc)}>{desc}</div>
178178
)}
179179
{detail !== undefined && (
180-
<p className={cx(fr.cx("fr-tile__detail"), classes.detail)}>{detail}</p>
180+
<div className={cx(fr.cx("fr-tile__detail"), classes.detail)}>
181+
{detail}
182+
</div>
181183
)}
182184
{start !== undefined && (
183185
<div className={cx(fr.cx("fr-tile__start"), classes.start)}>

stories/SideMenu.stories.tsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,18 @@ export const SideMenuWith3Levels = getStory({
307307
}
308308
]
309309
});
310+
311+
export const SideMenuWithNoTitle = getStory({
312+
"burgerMenuButtonText": "Dans cette rubrique",
313+
"items": [
314+
{
315+
"isActive": true,
316+
"text": "Accès direct",
317+
"linkProps": { "href": "#" }
318+
},
319+
{
320+
"text": "Accès direct",
321+
"linkProps": { "href": "#" }
322+
}
323+
]
324+
});

0 commit comments

Comments
 (0)