Fix sidebar positiion

This commit is contained in:
dominik-zeglen 2020-09-08 11:43:05 +02:00
parent da0677ca42
commit e8a69cd9fc
2 changed files with 66 additions and 48 deletions

View file

@ -1,6 +1,7 @@
import ClickAwayListener from "@material-ui/core/ClickAwayListener";
import Paper from "@material-ui/core/Paper";
import Popper from "@material-ui/core/Popper";
import { fade } from "@material-ui/core/styles/colorManipulator";
import makeStyles from "@material-ui/core/styles/makeStyles";
import Typography from "@material-ui/core/Typography";
import classNames from "classnames";
@ -16,6 +17,9 @@ export interface MenuItemProps {
onClick: (url: string, event: React.MouseEvent) => void;
}
export const menuWidth = 210;
export const shrunkMenuWidth = 72;
const useStyles = makeStyles(
theme => ({
hideLabel: {
@ -58,7 +62,7 @@ const useStyles = makeStyles(
border: "none",
borderBottomRightRadius: 100,
borderTopRightRadius: 100,
color: theme.palette.text.disabled,
color: fade(theme.palette.text.primary, 0.6),
cursor: "pointer",
display: "flex",
height: 56,
@ -66,7 +70,7 @@ const useStyles = makeStyles(
overflow: "hidden",
padding: theme.spacing(2, 3, 2, 3.5),
transition: theme.transitions.duration.shortest + "ms",
width: 72
width: shrunkMenuWidth
},
rootActive: {
"&$root": {
@ -76,7 +80,7 @@ const useStyles = makeStyles(
}
},
rootExpanded: {
width: 210
width: menuWidth
},
subMenuLabel: {
"&$label": {
@ -89,7 +93,7 @@ const useStyles = makeStyles(
},
background: "none",
border: "none",
color: theme.palette.text.disabled
color: fade(theme.palette.text.primary, 0.6)
}
}),
{

View file

@ -5,13 +5,14 @@ import { configurationMenuUrl } from "@saleor/configuration";
import { User } from "@saleor/fragments/types/User";
import useLocalStorage from "@saleor/hooks/useLocalStorage";
import { sectionNames } from "@saleor/intl";
import classNames from "classnames";
import React from "react";
import SVG from "react-inlinesvg";
import { useIntl } from "react-intl";
import { IMenuItem } from "../AppLayout/menuStructure";
import ExpandButton from "./ExpandButton";
import MenuItem from "./MenuItem";
import MenuItem, { menuWidth, shrunkMenuWidth } from "./MenuItem";
import { isMenuActive } from "./utils";
const useStyles = makeStyles(
@ -19,11 +20,18 @@ const useStyles = makeStyles(
expandButton: {
marginLeft: theme.spacing(2)
},
float: {
position: "fixed"
},
logo: {
margin: `36px 0 ${theme.spacing(3)}px ${theme.spacing(3)}px`
},
root: {
transition: "width 0.5s ease"
transition: "width 0.5s ease",
width: menuWidth
},
rootShrink: {
width: shrunkMenuWidth
}
}),
{
@ -57,55 +65,61 @@ const SideBar: React.FC<SideBarProps> = ({
const intl = useIntl();
return (
<div className={classes.root}>
<div className={classes.logo}>
<SVG src={logoLight} />
</div>
{menuItems.map(menuItem => {
const isActive = isMenuActive(location, menuItem);
<div
className={classNames(classes.root, {
[classes.rootShrink]: isShrunk
})}
>
<div className={classes.float}>
<div className={classes.logo}>
<SVG src={logoLight} />
</div>
{menuItems.map(menuItem => {
const isActive = isMenuActive(location, menuItem);
if (
menuItem.permission &&
!user.userPermissions
.map(perm => perm.code)
.includes(menuItem.permission)
) {
return null;
}
if (
menuItem.permission &&
!user.userPermissions
.map(perm => perm.code)
.includes(menuItem.permission)
) {
return null;
}
return (
return (
<MenuItem
active={isActive}
isMenuShrunk={isShrunk}
menuItem={menuItem}
onClick={onMenuItemClick}
/>
);
})}
{renderConfigure && (
<MenuItem
active={isActive}
active={
!menuItems.reduce(
(acc, menuItem) => acc || isMenuActive(location, menuItem),
false
)
}
isMenuShrunk={isShrunk}
menuItem={menuItem}
menuItem={{
ariaLabel: "configure",
icon: configurationIcon,
label: intl.formatMessage(sectionNames.configuration),
testingContextId: "configure",
url: configurationMenuUrl
}}
onClick={onMenuItemClick}
/>
);
})}
{renderConfigure && (
<MenuItem
active={
!menuItems.reduce(
(acc, menuItem) => acc || isMenuActive(location, menuItem),
false
)
}
isMenuShrunk={isShrunk}
menuItem={{
ariaLabel: "configure",
icon: configurationIcon,
label: intl.formatMessage(sectionNames.configuration),
testingContextId: "configure",
url: configurationMenuUrl
}}
onClick={onMenuItemClick}
)}
<ExpandButton
className={classes.expandButton}
isShrunk={isShrunk}
onClick={() => setShrink(!isShrunk)}
/>
)}
<ExpandButton
className={classes.expandButton}
isShrunk={isShrunk}
onClick={() => setShrink(!isShrunk)}
/>
</div>
</div>
);
};