Skip to content

Commit 0f38bf7

Browse files
committed
Fix QuickAction not clickable on header
1 parent 4b72d85 commit 0f38bf7

File tree

2 files changed

+42
-38
lines changed

2 files changed

+42
-38
lines changed

src/Header.tsx

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export type HeaderProps = {
5858
| "service"
5959
| "serviceTitle"
6060
| "serviceTagline"
61+
| "toolsLinks"
6162
| "menu"
6263
| "menuLinks",
6364
string
@@ -117,6 +118,30 @@ export const Header = memo(
117118

118119
const { Link } = getLink();
119120

121+
const quickAccessNode = (
122+
<ul className={fr.cx("fr-btns-group")}>
123+
{quickAccessItems.map(({ iconId, text, buttonProps, linkProps }, i) => (
124+
<li key={i}>
125+
{linkProps !== undefined ? (
126+
<Link
127+
{...linkProps}
128+
className={cx(fr.cx("fr-btn", iconId), linkProps.className)}
129+
>
130+
{text}
131+
</Link>
132+
) : (
133+
<button
134+
{...buttonProps}
135+
className={cx(fr.cx("fr-btn", iconId), buttonProps.className)}
136+
>
137+
{text}
138+
</button>
139+
)}
140+
</li>
141+
))}
142+
</ul>
143+
);
144+
120145
return (
121146
<header
122147
role="banner"
@@ -150,7 +175,12 @@ export const Header = memo(
150175
})()}
151176
</div>
152177
{operatorLogo !== undefined && (
153-
<div className={fr.cx("fr-header__operator")}>
178+
<div
179+
className={cx(
180+
fr.cx("fr-header__operator"),
181+
classes.operator
182+
)}
183+
>
154184
<Link {...homeLinkProps}>
155185
<img
156186
className={cx(
@@ -235,39 +265,13 @@ export const Header = memo(
235265
{(quickAccessItems.length > 0 || renderSearchInput !== undefined) && (
236266
<div className={fr.cx("fr-header__tools")}>
237267
{quickAccessItems.length > 0 && (
238-
<div className={fr.cx("fr-header__tools-links")}>
239-
<ul className={fr.cx("fr-btns-group")}>
240-
{quickAccessItems.map(
241-
(
242-
{ iconId, text, buttonProps, linkProps },
243-
i
244-
) => (
245-
<li key={i}>
246-
{linkProps !== undefined ? (
247-
<Link
248-
{...linkProps}
249-
className={cx(
250-
fr.cx("fr-btn", iconId),
251-
linkProps.className
252-
)}
253-
>
254-
{text}
255-
</Link>
256-
) : (
257-
<button
258-
{...buttonProps}
259-
className={cx(
260-
fr.cx("fr-btn", iconId),
261-
buttonProps.className
262-
)}
263-
>
264-
{text}
265-
</button>
266-
)}
267-
</li>
268-
)
269-
)}
270-
</ul>
268+
<div
269+
className={cx(
270+
fr.cx("fr-header__tools-links"),
271+
classes.toolsLinks
272+
)}
273+
>
274+
{quickAccessNode}
271275
</div>
272276
)}
273277

@@ -335,9 +339,9 @@ export const Header = memo(
335339
>
336340
{t("close")}
337341
</button>
338-
<div
339-
className={cx(fr.cx("fr-header__menu-links"), classes.menuLinks)}
340-
/>
342+
<div className={cx(fr.cx("fr-header__menu-links"), classes.menuLinks)}>
343+
{quickAccessNode}
344+
</div>
341345
{navigation !== undefined &&
342346
(navigation instanceof Array ? (
343347
<MainNavigation items={navigation} />

src/start.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export async function start(params: Params) {
3737
registerEffectAction
3838
});
3939

40-
(window as any).dsfr = { verbose, "mode": "manual" };
40+
(window as any).dsfr = { verbose, "mode": "react" };
4141

4242
await import("./dsfr/dsfr.module" as any);
4343

0 commit comments

Comments
 (0)