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

Jump to bottom

[Fix] Stick menu to top when AppBar is collapsed #7930

Merged
merged 1 commit into from Jul 6, 2022
Merged

[Fix] Stick menu to top when AppBar is collapsed #7930

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 13 additions & 7 deletions packages/ra-ui-materialui/src/layout/Layout.tsx
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ import { Menu as DefaultMenu, MenuProps } from './Menu';
import { Error, ErrorProps } from './Error';
import { SkipNavigationButton } from '../button';
import { useSidebarState } from './useSidebarState';
import { useScrollTrigger } from '@mui/material';

export const Layout = (props: LayoutProps) => {
const {
Expand All @@ -32,6 +33,7 @@ export const Layout = (props: LayoutProps) => {

const [open] = useSidebarState();
const [errorInfo, setErrorInfo] = useState<ErrorInfo>(null);
let trigger = useScrollTrigger();

const handleError = (error: Error, info: ErrorInfo) => {
setErrorInfo(info);
Expand All @@ -40,7 +42,11 @@ export const Layout = (props: LayoutProps) => {
return (
<StyledLayout className={clsx('layout', className)} {...rest}>
<SkipNavigationButton />
<div className={LayoutClasses.appFrame}>
<div
className={clsx(LayoutClasses.appFrame, {
'appbar-is-collapsed': trigger,
})}
>
<AppBar open={open} title={title} />
<main className={LayoutClasses.contentWithSidebar}>
<Sidebar>
Expand Down Expand Up @@ -109,13 +115,15 @@ const StyledLayout = styled('div', {
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
[theme.breakpoints.up('xs')]: {
marginTop: theme.spacing(6),
},
marginTop: theme.spacing(6),
transition: 'margin 0.25s ease-in-out',
[theme.breakpoints.down('sm')]: {
marginTop: theme.spacing(7),
},
},
[`& .${LayoutClasses.appFrame}.appbar-is-collapsed`]: {
marginTop: 0,
},
[`& .${LayoutClasses.contentWithSidebar}`]: {
display: 'flex',
flexGrow: 1,
Expand All @@ -127,12 +135,10 @@ const StyledLayout = styled('div', {
flexDirection: 'column',
flexGrow: 1,
flexBasis: 0,
padding: 0,
[theme.breakpoints.up('xs')]: {
paddingRight: theme.spacing(2),
paddingLeft: theme.spacing(1),
},
[theme.breakpoints.down('md')]: {
padding: 0,
},
},
}));