yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't hide sidebar when menu is open (#3203)

Browse Source
This commit is contained in:
Saumya Pandey
2022-03-05 23:00:41 +05:30
committed by GitHub
parent f69bcc7578
commit 8b0b383e9e
4 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/Sidebar/Sidebar.tsx
View File

@@ -6,6 +6,7 @@ import { useLocation } from "react-router-dom";
import styled, { useTheme } from "styled-components";
import breakpoint from "styled-components-breakpoint";
import Flex from "~/components/Flex";
import useMenuContext from "~/hooks/useMenuContext";
import usePrevious from "~/hooks/usePrevious";
import useStores from "~/hooks/useStores";
import { fadeIn } from "~/styles/animations";
@@ -26,8 +27,9 @@ const Sidebar = React.forwardRef<HTMLDivElement, Props>(
const { ui } = useStores();
const location = useLocation();
const previousLocation = usePrevious(location);
const { isMenuOpen } = useMenuContext();
const width = ui.sidebarWidth;
const collapsed = ui.isEditing || ui.sidebarCollapsed;
const collapsed = (ui.isEditing || ui.sidebarCollapsed) && !isMenuOpen;
const maxWidth = theme.sidebarMaxWidth;
const minWidth = theme.sidebarMinWidth + 16; // padding