From 65d54b35b60a2f6b5993739a6bb6782df27e1210 Mon Sep 17 00:00:00 2001
From: Marco Acierno <marcoaciernoemail@gmail.com>
Date: Thu, 11 Jun 2026 01:13:27 +0200
Subject: [PATCH 1/3] fix(schedule-builder): stretch items spanning multiple
 slots

PR #4664 replaced the item's <ul> with a Radix Card and dropped
bg-slate-200 from the grid wrapper, so items longer than their slot
rendered at content height instead of filling the spanned rows.
Make the Card fill its grid area with height: 100%.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../custom_admin/src/components/schedule-builder/item.tsx   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/backend/custom_admin/src/components/schedule-builder/item.tsx b/backend/custom_admin/src/components/schedule-builder/item.tsx
index 274b30bfa0..85458a2c9a 100644
--- a/backend/custom_admin/src/components/schedule-builder/item.tsx
+++ b/backend/custom_admin/src/components/schedule-builder/item.tsx
@@ -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">

From e80651a1cb4ebb96201ac2e32fe3345c25bf7fc2 Mon Sep 17 00:00:00 2001
From: Marco Acierno <marcoaciernoemail@gmail.com>
Date: Thu, 11 Jun 2026 01:18:27 +0200
Subject: [PATCH 2/3] fix(schedule-builder): keep admin editor dialog mounted
 while closing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DjangoAdminEditorModal returned null as soon as url was cleared, which
unmounts the open Radix Dialog mid-close. A modal Radix Dialog sets
pointer-events: none on <body> and an abrupt unmount can leave it
stuck, making the whole schedule builder (e.g. the Drop/Add cells)
unresponsive to hover and clicks until reload.

Keep Dialog.Root mounted and drive it via the open prop — same pattern
AddItemModal already uses — guarding only the iframe on url.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../shared/django-admin-editor-modal/index.tsx   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/custom_admin/src/components/shared/django-admin-editor-modal/index.tsx b/backend/custom_admin/src/components/shared/django-admin-editor-modal/index.tsx
index a74723a3af..11f2c6666d 100644
--- a/backend/custom_admin/src/components/shared/django-admin-editor-modal/index.tsx
+++ b/backend/custom_admin/src/components/shared/django-admin-editor-modal/index.tsx
@@ -40,13 +40,8 @@ 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()}>
@@ -54,7 +49,16 @@ export const DjangoAdminEditorModal = () => {
         <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>
   );

From e4e5843672baf17beccb1db61f1ae08e65cf9fbf Mon Sep 17 00:00:00 2001
From: Marco Acierno <marcoaciernoemail@gmail.com>
Date: Thu, 11 Jun 2026 02:03:04 +0200
Subject: [PATCH 3/3] fix(schedule-builder): lift dialog and popper z-index
 above page content

The "Type" select in the "Add event to schedule" modal opened its
options behind the dialog: the Radix Select content is portalled with
no z-index (stacking by DOM order), while custom-styles.css gives the
dialog overlay an explicit z-index. Before #4664 this was a native
<select>, which the browser always renders on top.

Raise the overlay to 500 (the old shared Modal level) so dialogs also
cover the schedule grid's z-[100] sticky headers, and give popper
content (Select, DropdownMenu, Popover, Tooltip) z-index 510 so it
stacks above open dialogs. The popper wrapper copies the content's
computed z-index, so class rules are sufficient.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 backend/custom_admin/src/custom-styles.css | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/backend/custom_admin/src/custom-styles.css b/backend/custom_admin/src/custom-styles.css
index da6cf32626..c9f1cdc4d5 100644
--- a/backend/custom_admin/src/custom-styles.css
+++ b/backend/custom_admin/src/custom-styles.css
@@ -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 {
