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

increase zIndex of modal sidebar to fix resize bug #4860

Merged
merged 1 commit into from
Sep 27, 2024
Merged
Changes from all 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
7 changes: 6 additions & 1 deletion app/packages/core/src/components/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import SchemaSettings from "../Schema/SchemaSettings";
import { Filter } from "./Entries";
import style from "./Sidebar.module.css";
import ViewSelection from "./ViewSelection";
import { useTheme as useMUITheme } from "@mui/material";

const MARGIN = 3;

Expand Down Expand Up @@ -693,6 +694,7 @@ const InteractiveSidebar = ({
() => new ResizeObserver(placeItems)
);
const theme = useTheme();
const muiTheme = useMUITheme();

return shown ? (
<Resizable
Expand All @@ -705,7 +707,10 @@ const InteractiveSidebar = ({
setWidth(width + delta);
}}
onResizeReset={resetWidth}
style={{ borderTopRightRadius: 8 }}
style={{
borderTopRightRadius: 8,
zIndex: modal ? muiTheme.zIndex.tooltip + 1 : undefined,
}}
>
<SchemaSettings />
{!modal && (
Expand Down
Loading