Skip to content

Commit ef47caa

Browse files
committed
refactor: header to avoid user menu duplication in the DOM
1 parent a8930a0 commit ef47caa

File tree

3 files changed

+10
-31
lines changed

3 files changed

+10
-31
lines changed

web-components/src/components/header/Header.styles.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,6 @@ export const useHeaderStyles = makeStyles<StyleProps>()(
102102
// BEGIN HACK setting jss styles (duplicated from mui components built-in emotion styles)
103103
// so it's initially rendered on gatsby build
104104
// Remove once migrations from mui jss to emotion and to latest gatsby done
105-
desktop: {
106-
[theme.breakpoints.down('md')]: {
107-
display: 'none',
108-
},
109-
[theme.breakpoints.up('md')]: {
110-
display: 'block',
111-
},
112-
},
113105
mobile: {
114106
[theme.breakpoints.down('md')]: {
115107
display: 'block',

web-components/src/components/header/index.tsx

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,7 @@ export default function Header({
7878
<HomeLink
7979
color={isTablet ? theme.palette.primary.contrastText : color}
8080
/>
81-
<Box
82-
className={styles.desktop}
83-
display={{ xs: 'none', md: 'block' }}
84-
>
81+
<Box className="flex items-center">
8582
<MenuList className={styles.menuList}>
8683
{menuItems?.map((item, index) => {
8784
return (
@@ -97,20 +94,15 @@ export default function Header({
9794
{isRegistry && extras}
9895
{websiteExtras}
9996
</MenuList>
100-
</Box>
101-
<Box
102-
className={styles.mobile}
103-
display={{ xs: 'block', md: 'none' }}
104-
>
105-
<MobileMenu
106-
linkComponent={linkComponent}
107-
isRegistry={isRegistry}
108-
pathname={pathname}
109-
menuItems={menuItems}
110-
extras={extras}
111-
websiteExtras={websiteExtras}
112-
isUserLoggedIn={isUserLoggedIn}
113-
/>
97+
<Box className={styles.mobile}>
98+
<MobileMenu
99+
linkComponent={linkComponent}getMuen
100+
pathname={pathname}
101+
menuItems={menuItems}
102+
websiteExtras={websiteExtras}
103+
isUserLoggedIn={isUserLoggedIn}
104+
/>
105+
</Box>
114106
</Box>
115107
</Box>
116108
</Container>

web-components/src/components/mobile-menu/index.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import { useMobileMenuStyles } from './MobileMenu.styles';
1515

1616
type Props = {
1717
menuItems?: Item[];
18-
isRegistry?: boolean;
1918
pathname: string;
20-
extras?: JSX.Element;
2119
linkComponent: React.FC<React.PropsWithChildren<NavLinkProps>>;
2220
websiteExtras?: JSX.Element;
2321
isUserLoggedIn?: boolean;
@@ -26,8 +24,6 @@ type Props = {
2624
const MobileMenu: React.FC<React.PropsWithChildren<Props>> = ({
2725
menuItems,
2826
pathname,
29-
isRegistry,
30-
extras,
3127
websiteExtras,
3228
linkComponent: Link,
3329
isUserLoggedIn,
@@ -51,7 +47,6 @@ const MobileMenu: React.FC<React.PropsWithChildren<Props>> = ({
5147
return (
5248
<div className={styles.root}>
5349
<Center>
54-
{isRegistry && extras}
5550
<HamburgerIcon
5651
className={cx(styles.hamburger, styles.icon)}
5752
onClick={handleToggle}

0 commit comments

Comments
 (0)