Skip to content

Commit 7de6ba4

Browse files
authored
fix: logistration hide user menu icon on mobile screens (#84)
VAN-227
1 parent 14fe2d9 commit 7de6ba4

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

src/Header.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function Header({ intl }) {
8585
username: authenticatedUser !== null ? authenticatedUser.username : null,
8686
avatar: authenticatedUser !== null ? authenticatedUser.avatar : null,
8787
mainMenu: getConfig().LOGISTRATION_MINIMAL_HEADER ? [] : mainMenu,
88-
userMenu,
88+
userMenu: getConfig().LOGISTRATION_MINIMAL_HEADER ? [] : userMenu,
8989
loggedOutItems: getConfig().LOGISTRATION_MINIMAL_HEADER ? [] : loggedOutItems,
9090
};
9191

src/MobileHeader.jsx

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ class MobileHeader extends React.Component {
9191
stickyOnMobile,
9292
intl,
9393
mainMenu,
94+
userMenu,
95+
loggedOutItems,
9496
} = this.props;
9597
const logoProps = { src: logo, alt: logoAltText, href: logoDestination };
9698
const stickyClassName = stickyOnMobile ? 'sticky-top' : '';
@@ -125,19 +127,21 @@ class MobileHeader extends React.Component {
125127
{ logoDestination === null ? <Logo className="logo" src={logo} alt={logoAltText} /> : <LinkedLogo className="logo" {...logoProps} itemType="http://schema.org/Organization" />}
126128
</div>
127129
<div className="w-100 d-flex justify-content-end align-items-center">
128-
<Menu tag="nav" aria-label={intl.formatMessage(messages['header.label.secondary.nav'])} className="position-static">
129-
<MenuTrigger
130-
tag="button"
131-
className="icon-button"
132-
aria-label={intl.formatMessage(messages['header.label.account.menu'])}
133-
title={intl.formatMessage(messages['header.label.account.menu'])}
134-
>
135-
<Avatar size="1.5rem" src={avatar} alt={username} />
136-
</MenuTrigger>
137-
<MenuContent tag="ul" className="nav flex-column pin-left pin-right border-top shadow py-2">
138-
{loggedIn ? this.renderUserMenuItems() : this.renderLoggedOutItems()}
139-
</MenuContent>
140-
</Menu>
130+
{userMenu.length > 0 || loggedOutItems.length > 0 ? (
131+
<Menu tag="nav" aria-label={intl.formatMessage(messages['header.label.secondary.nav'])} className="position-static">
132+
<MenuTrigger
133+
tag="button"
134+
className="icon-button"
135+
aria-label={intl.formatMessage(messages['header.label.account.menu'])}
136+
title={intl.formatMessage(messages['header.label.account.menu'])}
137+
>
138+
<Avatar size="1.5rem" src={avatar} alt={username} />
139+
</MenuTrigger>
140+
<MenuContent tag="ul" className="nav flex-column pin-left pin-right border-top shadow py-2">
141+
{loggedIn ? this.renderUserMenuItems() : this.renderLoggedOutItems()}
142+
</MenuContent>
143+
</Menu>
144+
) : null}
141145
</div>
142146
</header>
143147
);

src/index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ $white: #fff;
3232
}
3333

3434
.site-header-mobile {
35+
height: 3rem;
36+
3537
.nav-link {
3638
text-decoration: none;
3739
cursor: pointer;

0 commit comments

Comments
 (0)