Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: [M3-6376] – MUI v5 - Components > PrimaryNav #9090

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';
import { compose } from 'recompose';
import NavItem, { PrimaryLink } from './NavItem';
import { NavItem, PrimaryLink } from './NavItem';

import Help from 'src/assets/icons/help.svg';

Expand All @@ -12,9 +11,7 @@ interface Props {
isCollapsed?: boolean;
}

type CombinedProps = Props;

const AdditionalMenuItems: React.FC<CombinedProps> = (props) => {
export const AdditionalMenuItems = React.memo((props: Props) => {
const { isCollapsed } = props;
const links: PrimaryLink[] = [
{
Expand All @@ -39,6 +36,4 @@ const AdditionalMenuItems: React.FC<CombinedProps> = (props) => {
})}
</React.Fragment>
);
};

export default compose<CombinedProps, Props>(React.memo)(AdditionalMenuItems);
});
9 changes: 2 additions & 7 deletions packages/manager/src/components/PrimaryNav/NavItem.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import classNames from 'classnames';
import * as React from 'react';
import { Link } from 'react-router-dom';
import { compose } from 'recompose';
import Divider from 'src/components/core/Divider';
import ListItem from 'src/components/core/ListItem';
import ListItemText from 'src/components/core/ListItemText';
Expand All @@ -25,9 +24,7 @@ export interface PrimaryLink {
isDisabled?: () => string;
}

type CombinedProps = Props;

const NavItem: React.SFC<CombinedProps> = (props) => {
export const NavItem = React.memo((props: Props) => {
const {
href,
onClick,
Expand Down Expand Up @@ -96,6 +93,4 @@ const NavItem: React.SFC<CombinedProps> = (props) => {
<Divider className={props.dividerClasses} />
</React.Fragment>
);
};

export default compose<CombinedProps, Props>(React.memo)(NavItem);
});
270 changes: 138 additions & 132 deletions packages/manager/src/components/PrimaryNav/PrimaryNav.styles.ts
Original file line number Diff line number Diff line change
@@ -1,164 +1,170 @@
import { makeStyles } from '@mui/styles';
import { Theme } from '@mui/material/styles';
import { keyframes } from 'tss-react';
import { makeStyles } from 'tss-react/mui';

const SLIDE_IN_TRANSFORM = 'matrix(0.01471, 0, 0, 1, 123.982745, 0.000015)';
const SLIDE_OUT_TRANSFORM = 'translate(0)';
dwiley-akamai marked this conversation as resolved.
Show resolved Hide resolved

const useStyles = makeStyles((theme: Theme) => ({
'@keyframes slideIn': {
from: {
transform: SLIDE_IN_TRANSFORM,
},
to: {
transform: SLIDE_OUT_TRANSFORM,
},
const slideIn = keyframes`
from {
transform: ${SLIDE_IN_TRANSFORM},
}
to {
transform: ${SLIDE_OUT_TRANSFORM},
}
`;

const slideOut = keyframes`
from: {
transform: ${SLIDE_OUT_TRANSFORM},
},
'@keyframes slideOut': {
from: {
transform: SLIDE_OUT_TRANSFORM,
},
to: {
transform: SLIDE_IN_TRANSFORM,
},
to: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the colons from keyframe rules

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! It was also the presence of commas instead of semi-colons that was problematic

transform: ${SLIDE_IN_TRANSFORM},
},
menuGrid: {
minHeight: 64,
height: '100%',
width: '100%',
margin: 0,
padding: 0,
[theme.breakpoints.up('sm')]: {
minHeight: 72,
`;

const useStyles = makeStyles<void, 'linkItem'>()(
(theme: Theme, _params, classes) => ({
menuGrid: {
minHeight: 64,
height: '100%',
width: '100%',
margin: 0,
padding: 0,
[theme.breakpoints.up('sm')]: {
minHeight: 72,
},
[theme.breakpoints.up('md')]: {
minHeight: 80,
},
'&:hover': {
'& path.akamai-clip-path': {
animation: `${slideIn} .33s ease-in-out`,
},
},
},
[theme.breakpoints.up('md')]: {
minHeight: 80,
fadeContainer: {
display: 'flex',
flexDirection: 'column',
height: 'calc(100% - 90px)',
width: '100%',
},
'&:hover': {
logoItemAkamai: {
paddingTop: 12,
paddingLeft: 12,
transition: 'padding-left .03s linear',
'& path.akamai-clip-path': {
animation: '$slideIn .33s ease-in-out',
animation: `${slideIn} .33s ease-in-out`,
},
},
},
fadeContainer: {
display: 'flex',
flexDirection: 'column',
height: 'calc(100% - 90px)',
width: '100%',
},
logoItemAkamai: {
paddingTop: 12,
paddingLeft: 12,
transition: 'padding-left .03s linear',
'& path.akamai-clip-path': {
animation: '$slideIn .33s ease-in-out',
logoItemAkamaiCollapsed: {
paddingLeft: 8,
},
},
logoItemAkamaiCollapsed: {
paddingLeft: 8,
},
logoAkamaiCollapsed: {
background: theme.bg.primaryNavPaper,
width: 96,
'& path.akamai-clip-path': {
animation: '$slideOut 0s ease-in-out 0s forwards',
logoAkamaiCollapsed: {
background: theme.bg.primaryNavPaper,
width: 96,
'& path.akamai-clip-path': {
animation: `${slideOut} 0s ease-in-out 0s forwards`,
},
},
},
listItem: {
display: 'flex',
alignItems: 'center',
cursor: 'pointer',
height: 36,
lineHeight: 0,
padding: '12px 16px',
position: 'relative',
transition: theme.transitions.create(['background-color']),
'& p': {
marginTop: 0,
marginBottom: 0,
listItem: {
display: 'flex',
alignItems: 'center',
cursor: 'pointer',
height: 36,
lineHeight: 0,
padding: '12px 16px',
position: 'relative',
transition: theme.transitions.create(['background-color']),
'& p': {
marginTop: 0,
marginBottom: 0,
},
'&:focus': {
textDecoration: 'none',
},
'&:hover': {
border: 'red',
backgroundImage: 'linear-gradient(98deg, #38584B 1%, #3A5049 166%)',
textDecoration: 'none',
[`& .${classes.linkItem}`]: {
color: 'white',
},
'& .icon': {
opacity: 1,
},
'& svg': {
color: theme.color.teal,
fill: theme.color.teal,
},
},
'& .icon': {
color: '#CFD0D2',
marginRight: theme.spacing(2),
opacity: 0.5,
'& svg': {
display: 'flex',
alignItems: 'center',
height: 20,
width: 20,
'&:not(.wBorder) circle, & .circle': {
display: 'none',
},
},
},
},
'&:focus': {
textDecoration: 'none',
linkItem: {
display: 'flex',
alignItems: 'center',
color: '#fff',
fontFamily: 'LatoWebBold', // we keep this bold at all times
opacity: 1,
transition: theme.transitions.create(['color']),
whiteSpace: 'nowrap',
'&.hiddenWhenCollapsed': {
opacity: 0,
},
},
'&:hover': {
border: 'red',
active: {
backgroundImage: 'linear-gradient(98deg, #38584B 1%, #3A5049 166%)',
textDecoration: 'none',
'& $linkItem': {
color: 'white',
},
'& .icon': {
opacity: 1,
},
'& svg': {
color: theme.color.teal,
fill: theme.color.teal,
},
},
'& .icon': {
color: '#CFD0D2',
marginRight: theme.spacing(2),
opacity: 0.5,
'& svg': {
display: 'flex',
alignItems: 'center',
height: 20,
width: 20,
'&:not(.wBorder) circle, & .circle': {
display: 'none',
},
},
divider: {
backgroundColor: 'rgba(0, 0, 0, 0.12)',
color: '#222',
},
},
linkItem: {
display: 'flex',
alignItems: 'center',
color: '#fff',
fontFamily: 'LatoWebBold', // we keep this bold at all times
opacity: 1,
transition: theme.transitions.create(['color']),
whiteSpace: 'nowrap',
'&.hiddenWhenCollapsed': {
opacity: 0,
chip: {
marginTop: 2,
},
},
active: {
backgroundImage: 'linear-gradient(98deg, #38584B 1%, #3A5049 166%)',
textDecoration: 'none',
'& .icon': {
opacity: 1,
},
'& svg': {
color: theme.color.teal,
},
},
divider: {
backgroundColor: 'rgba(0, 0, 0, 0.12)',
color: '#222',
},
chip: {
marginTop: 2,
},
logoSvgCollapsed: {
// Hide 'Akamai Cloud Computing' when the navigation is collapsed and the nav is not hovered
'& > g ': {
display: 'none',
logoSvgCollapsed: {
// Hide 'Akamai' text when the navigation is collapsed and the nav is not hovered
'& > g ': {
display: 'none',
},
'nav:hover & > g ': {
display: 'unset',
},
// Make the logo 115px so that the Akamai logo is centered when the navigation is collapsed
width: 115,
},
'nav:hover & > g ': {
display: 'unset',
logoContainer: {
// when the nav is collapsed, but hovered by the user, make the logo full sized
'nav:hover & > svg ': {
width: 128,
},
},
// Make the logo 115px so that the Linode 'bug' is centered when the navigation is collapsed
width: 115,
},
logoContainer: {
// when the nav is collapsed, but hovered by the user, make the logo full sized
'nav:hover & > svg ': {
width: 128,
logo: {
// give the svg a transition so it smoothly resizes
transition: 'width .1s linear',
},
},
logo: {
// give the svg a transition so it smoothly resizes
transition: 'width .1s linear',
},
}));
})
);

// TODO jss-to-tss-react codemod: usages of this hook outside of this file will not be converted.
export default useStyles;
Loading