Skip to content

Commit

Permalink
Resolve DefaultLayoutjsx conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
dredmonds committed Feb 5, 2025
1 parent 6eb11e6 commit 2641753
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions src/client/components/Layout/DefaultLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,23 @@ const DefaultLayout = ({
showVerticalNav={showVerticalNav}
onShowVerticalNav={setShowVerticalNav}
/>
<LocalHeader
superheading={superheading}
heading={heading}
headingLink={headingLink}
subheading={subheading}
flashMessages={flashMessages}
breadcrumbs={
breadcrumbs || [{ link: '/', text: 'Home' }, { text: heading }]
}
useReactRouter={useReactRouter}
>
{localHeaderChildren}
</LocalHeader>
{localHeader ? (
localHeader
) : (
<LocalHeader
superheading={superheading}
heading={heading}
headingLink={headingLink}
subheading={subheading}
flashMessages={flashMessages}
breadcrumbs={
breadcrumbs || [{ link: '/', text: 'Home' }, { text: heading }]
}
useReactRouter={useReactRouter}
>
{localHeaderChildren}
</LocalHeader>
)}
<Main>
<GridRow>
<GridCol>{children}</GridCol>
Expand Down

0 comments on commit 2641753

Please sign in to comment.