Skip to content
Snippets Groups Projects
Commit e2bbb99c authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Fixed issue with main menu not showing up when there is no custom navigation.

parent 8539ed91
Branches
No related tags found
1 merge request!105Fixed issue with main menu not showing up when there is no custom navigation.
Pipeline #233032 passed
...@@ -15,6 +15,7 @@ import EditIcon from '@mui/icons-material/Edit' ...@@ -15,6 +15,7 @@ import EditIcon from '@mui/icons-material/Edit'
import ExpandMoreIcon from '@mui/icons-material/ExpandMore' import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
import GroupIcon from '@mui/icons-material/Group' import GroupIcon from '@mui/icons-material/Group'
import HelpIcon from '@mui/icons-material/Help' import HelpIcon from '@mui/icons-material/Help'
import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
import LinkIcon from '@mui/icons-material/Link' import LinkIcon from '@mui/icons-material/Link'
import LinkOffIcon from '@mui/icons-material/LinkOff' import LinkOffIcon from '@mui/icons-material/LinkOff'
import LockIcon from '@mui/icons-material/Lock' import LockIcon from '@mui/icons-material/Lock'
...@@ -33,6 +34,7 @@ import VisibilityIcon from '@mui/icons-material/Visibility' ...@@ -33,6 +34,7 @@ import VisibilityIcon from '@mui/icons-material/Visibility'
import VisibilityOffIcon from '@mui/icons-material/VisibilityOff' import VisibilityOffIcon from '@mui/icons-material/VisibilityOff'
import {useTheme} from '@mui/material' import {useTheme} from '@mui/material'
export const ArrowUp = KeyboardArrowUpIcon
export const Close = ClearIcon export const Close = ClearIcon
export const Remove = DeleteIcon export const Remove = DeleteIcon
export const ExpandMore = ExpandMoreIcon export const ExpandMore = ExpandMoreIcon
......
import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
import MenuIcon from '@mui/icons-material/Menu'
import { import {
Box, Box,
Container, Container,
...@@ -17,6 +15,7 @@ import {useScroll} from 'react-use' ...@@ -17,6 +15,7 @@ import {useScroll} from 'react-use'
import {SxProps} from '../../utils/types' import {SxProps} from '../../utils/types'
import MainMenu from '../app/MainMenu' import MainMenu from '../app/MainMenu'
import {ArrowUp, Menu} from '../icons'
import Breadcrumbs from '../navigation/Breadcrumbs' import Breadcrumbs from '../navigation/Breadcrumbs'
import usePage, {pageContext} from './usePage' import usePage, {pageContext} from './usePage'
...@@ -53,7 +52,7 @@ function ScrollTop() { ...@@ -53,7 +52,7 @@ function ScrollTop() {
sx={{position: 'fixed', bottom: 16, right: 16, zIndex: 1000}} sx={{position: 'fixed', bottom: 16, right: 16, zIndex: 1000}}
> >
<Fab size='small' title='Scroll to top'> <Fab size='small' title='Scroll to top'>
<KeyboardArrowUpIcon /> <ArrowUp />
</Fab> </Fab>
</Box> </Box>
</Fade> </Fade>
...@@ -346,7 +345,7 @@ export default function Page({ ...@@ -346,7 +345,7 @@ export default function Page({
return ( return (
<PageRoot className={classes.root} sx={sx}> <PageRoot className={classes.root} sx={sx}>
{navigation && showNavigationAsDrawer && variant === 'page' && ( {showNavigationAsDrawer && variant === 'page' && (
<PageNavigationDrawer <PageNavigationDrawer
className={classes.navigationDrawer} className={classes.navigationDrawer}
anchor='left' anchor='left'
...@@ -375,14 +374,14 @@ export default function Page({ ...@@ -375,14 +374,14 @@ export default function Page({
)} )}
<PageScrollableContent fullwidth={fullwidth}> <PageScrollableContent fullwidth={fullwidth}>
<PageBreadcrumbsWithNavigation> <PageBreadcrumbsWithNavigation>
{navigation && showNavigationAsDrawer && variant === 'page' && ( {showNavigationAsDrawer && variant === 'page' && (
<IconButton <IconButton
data-testid='navigation-button' data-testid='navigation-button'
color='primary' color='primary'
size='small' size='small'
onClick={handleOpenNavigation} onClick={handleOpenNavigation}
> >
<MenuIcon /> <Menu />
</IconButton> </IconButton>
)} )}
<Breadcrumbs /> <Breadcrumbs />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment