Skip to content

Commit c8a0601

Browse files
committed
fix type errors
1 parent 05511a5 commit c8a0601

File tree

3 files changed

+35
-33
lines changed

3 files changed

+35
-33
lines changed

apps/_components/src/Container/Container.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import cl from 'clsx/lite';
33
import classes from './Container.module.css';
44

55
type ContainerProps = {
6-
children: React.ReactNode;
6+
children?: React.ReactNode;
77
className?: string;
88
};
99

apps/_components/src/Header/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const Header = ({ menu, betaTag }: HeaderProps) => {
6161
onClick={() => setOpen(false)}
6262
prefetch={false}
6363
className={cl(
64-
pathname.includes(item.href) && classes.active,
64+
pathname?.includes(item.href) && classes.active,
6565
classes.link,
6666
'ds-paragraph--md',
6767
'ds-focus',

apps/storefront/layouts/MenuPageLayout/MenuPageLayout.tsx

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -46,39 +46,41 @@ const MenuPageLayout = ({ content, data, banner }: PageLayoutProps) => {
4646
{banner.ingress && <BannerIngress>{banner.ingress}</BannerIngress>}
4747
</Banner>
4848
)}
49-
<Container className={classes.page}>
50-
<div className={classes.left}>
51-
<SidebarMenu routerPath={pathname} />
52-
</div>
53-
<main id='main' className={classes.right}>
54-
{data && (
55-
<div className={classes.header}>
56-
<div className={classes.headerText}>
57-
<Heading size='lg' className={classes.title}>
58-
{data.title}
59-
</Heading>
60-
{data.date && <div className={classes.date}>{data.date}</div>}
61-
</div>
62-
<div
63-
className={cn(
64-
classes.iconContainer,
65-
data.color === 'red' && classes.red,
66-
data.color === 'blue' && classes.blue,
67-
data.color === 'yellow' && classes.yellow,
68-
)}
69-
>
70-
{data.icon && data.icon}
71-
{!data.icon && <ComponentIcon fontSize='4rem' />}
49+
{pathname && (
50+
<Container className={classes.page}>
51+
<div className={classes.left}>
52+
<SidebarMenu routerPath={pathname} />
53+
</div>
54+
<main id='main' className={classes.right}>
55+
{data && (
56+
<div className={classes.header}>
57+
<div className={classes.headerText}>
58+
<Heading size='lg' className={classes.title}>
59+
{data.title}
60+
</Heading>
61+
{data.date && <div className={classes.date}>{data.date}</div>}
62+
</div>
63+
<div
64+
className={cn(
65+
classes.iconContainer,
66+
data.color === 'red' && classes.red,
67+
data.color === 'blue' && classes.blue,
68+
data.color === 'yellow' && classes.yellow,
69+
)}
70+
>
71+
{data.icon && data.icon}
72+
{!data.icon && <ComponentIcon fontSize='4rem' />}
73+
</div>
7274
</div>
73-
</div>
74-
)}
75+
)}
7576

76-
<div className={classes.content} id='content'>
77-
<MdxContent>{content}</MdxContent>
78-
<GithubLink className={classes.githubLink} />
79-
</div>
80-
</main>
81-
</Container>
77+
<div className={classes.content} id='content'>
78+
<MdxContent>{content}</MdxContent>
79+
<GithubLink className={classes.githubLink} />
80+
</div>
81+
</main>
82+
</Container>
83+
)}
8284
</div>
8385
);
8486
};

0 commit comments

Comments
 (0)