Skip to content

Fix schedule builder Radix regressions #4669

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

Draft
marcoacierno wants to merge 3 commits into
base: main
Choose a base branch
from
+29 −8
Draft

Fix schedule builder Radix regressions #4669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65d54b3
fix(schedule-builder): stretch items spanning multiple slots
marcoacierno Jun 10, 2026
e80651a
fix(schedule-builder): keep admin editor dialog mounted while closing
marcoacierno Jun 10, 2026
e4e5843
fix(schedule-builder): lift dialog and popper z-index above page content
marcoacierno Jun 11, 2026
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
6 changes: 5 additions & 1 deletion backend/custom_admin/src/components/schedule-builder/item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,11 @@ export const ScheduleItemCard = ({
};

return (
<Card ref={dragRef} size="1" style={{ opacity, cursor: "grab" }}>
<Card
ref={dragRef}
size="1"
style={{ opacity, cursor: "grab", height: "100%" }}
>
<Flex direction="column" gap="1" align="start">
{availability === "unavailable" && (
<Flex align="center" gap="1">
Expand Down
16 changes: 10 additions & 6 deletions backend/custom_admin/src/components/shared/django-admin-editor-modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,25 @@ export const DjangoAdminEditorModal = () => {
});
};

if (!url) {
return null;
}

const baseUrl =
document.location.ancestorOrigins?.[0] || document.location.origin;
const itemUrl = `${baseUrl}/admin${url}`;

return (
<Dialog.Root open={isOpen} onOpenChange={(open) => !open && onClose()}>
<Dialog.Content maxWidth="90vw" width="90vw">
<VisuallyHidden>
<Dialog.Title>Admin view</Dialog.Title>
</VisuallyHidden>
<iframe title="Admin view" src={itemUrl} className="w-full h-[85vh]" />
{/* url is null while the dialog animates closed; keep Dialog.Root
mounted so Radix can finish closing and restore body pointer
events — unmounting it while open leaves the page unclickable. */}
{url && (
<iframe
title="Admin view"
src={`${baseUrl}/admin${url}`}
className="w-full h-[85vh]"
/>
)}
</Dialog.Content>
</Dialog.Root>
);
Expand Down
15 changes: 14 additions & 1 deletion backend/custom_admin/src/custom-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,20 @@
opacity: 0;
animation: rt-fade-out 200ms cubic-bezier(0.16, 1, 0.3, 1);
}
z-index: 30;
/* Must beat the schedule grid's z-[100] sticky headers: .radix-themes
creates no stacking context, so the grid competes with portals at the
body level. 500 matches the old shared Modal overlay. */
z-index: 500;
}

/* Portalled popper content (Select, DropdownMenu, Popover, Tooltip) has no
z-index in Radix Themes and relies on DOM order, so it paints below the
dialog overlay once that has an explicit z-index. The popper wrapper copies
the content's computed z-index, so a class rule here is enough. */
.rt-PopperContent,
.rt-SelectContent,
.rt-TooltipContent {
z-index: 510;
}

.rt-BaseDialogContent {
Expand Down
Loading