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.

Sign up for GitHub

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

[RFR] Convert AppBar component to useStyles #3582

Merged
merged 1 commit into from
Aug 23, 2019
Merged

[RFR] Convert AppBar component to useStyles #3582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
139 changes: 70 additions & 69 deletions packages/ra-ui-materialui/src/layout/AppBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import MuiAppBar from '@material-ui/core/AppBar';
import Toolbar from '@material-ui/core/Toolbar';
import IconButton from '@material-ui/core/IconButton';
import Typography from '@material-ui/core/Typography';
import { withStyles, createStyles } from '@material-ui/core/styles';
import { makeStyles } from '@material-ui/core/styles';
import MenuIcon from '@material-ui/icons/Menu';
import withWidth from '@material-ui/core/withWidth';
import compose from 'recompose/compose';
Expand All @@ -16,40 +16,39 @@ import LoadingIndicator from './LoadingIndicator';
import DefaultUserMenu from './UserMenu';
import HideOnScroll from './HideOnScroll';

const styles = theme =>
createStyles({
toolbar: {
paddingRight: 24,
},
menuButton: {
marginLeft: '0.5em',
marginRight: '0.5em',
},
menuButtonIconClosed: {
transition: theme.transitions.create(['transform'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
transform: 'rotate(0deg)',
},
menuButtonIconOpen: {
transition: theme.transitions.create(['transform'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
transform: 'rotate(180deg)',
},
title: {
flex: 1,
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
overflow: 'hidden',
},
});
const useStyles = makeStyles(theme => ({
toolbar: {
paddingRight: 24,
},
menuButton: {
marginLeft: '0.5em',
marginRight: '0.5em',
},
menuButtonIconClosed: {
transition: theme.transitions.create(['transform'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
transform: 'rotate(0deg)',
},
menuButtonIconOpen: {
transition: theme.transitions.create(['transform'], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
transform: 'rotate(180deg)',
},
title: {
flex: 1,
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
overflow: 'hidden',
},
}));

const AppBar = ({
children,
classes,
classes: classesOverride,
className,
logo,
logout,
Expand All @@ -59,44 +58,47 @@ const AppBar = ({
userMenu,
width,
...rest
}) => (
<HideOnScroll>
<MuiAppBar className={className} color="secondary" {...rest}>
<Toolbar
disableGutters
variant={width === 'xs' ? 'regular' : 'dense'}
className={classes.toolbar}
>
<IconButton
color="inherit"
aria-label="open drawer"
onClick={toggleSidebar}
className={classNames(classes.menuButton)}
}) => {
const classes = useStyles({ classes: classesOverride });
return (
<HideOnScroll>
<MuiAppBar className={className} color="secondary" {...rest}>
<Toolbar
disableGutters
variant={width === 'xs' ? 'regular' : 'dense'}
className={classes.toolbar}
>
<MenuIcon
classes={{
root: open
? classes.menuButtonIconOpen
: classes.menuButtonIconClosed,
}}
/>
</IconButton>
{Children.count(children) === 0 ? (
<Typography
variant="h6"
<IconButton
color="inherit"
className={classes.title}
id="react-admin-title"
/>
) : (
children
)}
<LoadingIndicator />
{cloneElement(userMenu, { logout })}
</Toolbar>
</MuiAppBar>
</HideOnScroll>
);
aria-label="open drawer"
onClick={toggleSidebar}
className={classNames(classes.menuButton)}
>
<MenuIcon
classes={{
root: open
? classes.menuButtonIconOpen
: classes.menuButtonIconClosed,
}}
/>
</IconButton>
{Children.count(children) === 0 ? (
<Typography
variant="h6"
color="inherit"
className={classes.title}
id="react-admin-title"
/>
) : (
children
)}
<LoadingIndicator />
{cloneElement(userMenu, { logout })}
</Toolbar>
</MuiAppBar>
</HideOnScroll>
);
};

AppBar.propTypes = {
children: PropTypes.node,
Expand All @@ -122,7 +124,6 @@ const enhance = compose(
toggleSidebar: toggleSidebarAction,
}
),
withStyles(styles),
withWidth()
);

Expand Down