Skip to content

Commit 849a313

Browse files
committed
Merge branch 'main' into feature/consent-banner
2 parents b1f9960 + 5ca086b commit 849a313

File tree

3 files changed

+24
-13
lines changed

3 files changed

+24
-13
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": "0.47.0",
3+
"version": "0.48.0",
44
"description": "French State Design System React integration library",
55
"repository": {
66
"type": "git",

src/Footer.tsx

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,10 @@ export const Footer = memo(
183183
)}
184184
>
185185
{linkList.map(
186-
column =>
186+
(column, columnIndex) =>
187187
column !== undefined && (
188188
<div
189+
key={`fr-footer__top-cat-${columnIndex}`}
189190
className={fr.cx(
190191
"fr-col-12",
191192
"fr-col-sm-3",
@@ -198,18 +199,22 @@ export const Footer = memo(
198199
</h3>
199200
)}
200201
<ul className={fr.cx("fr-footer__top-list")}>
201-
{column?.links.map(linkItem => (
202-
<li>
203-
<Link
204-
{...linkItem?.linkProps}
205-
className={fr.cx(
206-
"fr-footer__top-link"
207-
)}
202+
{column?.links.map(
203+
(linkItem, linkItemIndex) => (
204+
<li
205+
key={`fr-footer__top-link-${linkItemIndex}`}
208206
>
209-
{linkItem?.text}
210-
</Link>
211-
</li>
212-
))}
207+
<Link
208+
{...linkItem?.linkProps}
209+
className={fr.cx(
210+
"fr-footer__top-link"
211+
)}
212+
>
213+
{linkItem?.text}
214+
</Link>
215+
</li>
216+
)
217+
)}
213218
</ul>
214219
</div>
215220
)

src/Tile.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ export type TileProps = {
1515
desc?: ReactNode;
1616
imageUrl?: string;
1717
imageAlt?: string;
18+
imageWidth?: string | number;
19+
imageHeight?: string | number;
1820
grey?: boolean;
1921

2022
/** make the whole tile clickable */
@@ -39,6 +41,8 @@ export const Tile = memo(
3941
desc,
4042
imageUrl,
4143
imageAlt,
44+
imageWidth,
45+
imageHeight,
4246
horizontal = false,
4347
grey = false,
4448
classes = {},
@@ -88,6 +92,8 @@ export const Tile = memo(
8892
className={cx(fr.cx("fr-responsive-img"), classes.imgTag)}
8993
src={imageUrl}
9094
alt={imageAlt}
95+
width={imageWidth}
96+
height={imageHeight}
9197
/>
9298
</div>
9399
)) ||

0 commit comments

Comments
 (0)