Skip to content

Regression: Admin Sidebar Scroll #19944

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

Merged
ggazzo merged 1 commit into from
Dec 22, 2020
Merged

Regression: Admin Sidebar Scroll #19944

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
14 changes: 8 additions & 6 deletions client/components/Sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ import { useTranslation } from '../contexts/TranslationContext';
import { useRoutePath } from '../contexts/RouterContext';
import ScrollableContentWrapper from './ScrollableContentWrapper';

const Sidebar = ({ children, ...props }) => <Box display='flex' flexDirection='column' h='full' {...props}>
const Sidebar = ({ children, ...props }) => <Box display='flex' flexDirection='column' h='full' justifyContent='stretch' {...props}>
{children}
</Box>;

const Content = ({ children, ...props }) => <ScrollableContentWrapper {...props}>
<Box display='flex' flexDirection='column' h='full'>
{children}
</Box>
</ScrollableContentWrapper>;
const Content = ({ children, ...props }) => <Box display='flex' flexDirection='column' flexGrow={1} flexShrink={1} overflow='hidden'>
<ScrollableContentWrapper {...props}>
<Box display='flex' flexDirection='column' w='full' h='full'>
{children}
</Box>
</ScrollableContentWrapper>
</Box>;

const Header = ({ title, onClose, children = undefined, ...props }) => <Box is='header' display='flex' flexDirection='column' pb='x16' {...props}>
{(title || onClose) && <Box display='flex' flexDirection='row' alignItems='center' pi='x24' justifyContent='space-between' flexGrow={1}>
Expand Down