From 38640f773d4d58f27d046fb1bdf91d497e2a39b5 Mon Sep 17 00:00:00 2001
From: Jake Howell <jake@hwll.me>
Date: Mon, 24 Aug 2026 23:35:01 +0700
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A4=96=20fix(site):=20raise=20version?=
 =?UTF-8?q?=20picker=20popover=20above=20the=20change-version=20dialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On release/2.36 the Change version dialog is still an MUI Dialog
(z-index: 1300), while the version picker is a Radix popover that
portals to document.body at z-50. Two body-level portals means the
options paint behind the dialog surface and are unclickable
(DEVEX-780).

Bump the ComboboxContent z-index above the MUI dialog so the portalled
popover renders in front. main is unaffected: #27506 already moved all
dialogs onto Radix, but that landed after the 2.36 branch cut.
---
 .../WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx b/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
index d0709b8ba8f84..50319dae562d7 100644
--- a/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
+++ b/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
@@ -104,8 +104,14 @@ export const ChangeWorkspaceVersionDialog: FC<
 											className="w-full min-w-0 pl-3.5"
 										/>
 									</ComboboxTrigger>
+									{/*
+									 * z-[1400] keeps this portalled popover above the
+									 * MUI Dialog (z-index: 1300) that still backs this
+									 * dialog on release/2.36. Without it the options
+									 * paint behind the dialog surface (DEVEX-780).
+									 */}
 									<ComboboxContent
-										className="max-w-none min-w-[min(100%,320px)]"
+										className="z-[1400] max-w-none min-w-[min(100%,320px)]"
 										align="start"
 									>
 										<ComboboxInput placeholder="Search versions…" />

From ca80695eae511f1e0d0f1792d8a589942bb7b0f3 Mon Sep 17 00:00:00 2001
From: Jake Howell <jake@hwll.me>
Date: Mon, 24 Aug 2026 23:42:16 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A4=96=20fix(site):=20render=20versio?=
 =?UTF-8?q?n=20picker=20in=20place=20so=20it=20clears=20the=20dialog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On release/2.36 the Change version dialog is still an MUI Dialog
(z-index: 1300), while the version picker is a Radix popover that
portals to document.body at z-50, so the options paint behind the
dialog surface and are unclickable (DEVEX-780).

Render the popover in place with disablePortal instead. It stays inside
the dialog's stacking context (so it paints in front without a magic
z-index) and inside the focus trap, which is the accessibility issue the
ticket describes. main is unaffected: #27506 already moved all dialogs
onto Radix, but that landed after the 2.36 branch cut.
---
 .../ChangeWorkspaceVersionDialog.tsx                | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx b/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
index 50319dae562d7..e8b58150b9523 100644
--- a/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
+++ b/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
@@ -105,13 +105,16 @@ export const ChangeWorkspaceVersionDialog: FC<
 										/>
 									</ComboboxTrigger>
 									{/*
-									 * z-[1400] keeps this portalled popover above the
-									 * MUI Dialog (z-index: 1300) that still backs this
-									 * dialog on release/2.36. Without it the options
-									 * paint behind the dialog surface (DEVEX-780).
+									 * disablePortal renders the popover in place instead
+									 * of portalling to document.body. The dialog is still
+									 * an MUI Dialog (z-index: 1300) on release/2.36, so a
+									 * body portal lands behind it. Keeping the popover
+									 * inside the dialog also keeps it in the focus trap
+									 * (DEVEX-780).
 									 */}
 									<ComboboxContent
-										className="z-[1400] max-w-none min-w-[min(100%,320px)]"
+										disablePortal
+										className="max-w-none min-w-[min(100%,320px)]"
 										align="start"
 									>
 										<ComboboxInput placeholder="Search versions…" />

From 98aba67b36e21da88437f356f807680a8f9121da Mon Sep 17 00:00:00 2001
From: Jake Howell <jake@hwll.me>
Date: Mon, 24 Aug 2026 23:53:30 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=A4=96=20chore(site):=20drop=20explan?=
 =?UTF-8?q?atory=20comment=20from=20version=20picker=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx b/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
index e8b58150b9523..6f36dd8b8e367 100644
--- a/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
+++ b/site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
@@ -104,14 +104,6 @@ export const ChangeWorkspaceVersionDialog: FC<
 											className="w-full min-w-0 pl-3.5"
 										/>
 									</ComboboxTrigger>
-									{/*
-									 * disablePortal renders the popover in place instead
-									 * of portalling to document.body. The dialog is still
-									 * an MUI Dialog (z-index: 1300) on release/2.36, so a
-									 * body portal lands behind it. Keeping the popover
-									 * inside the dialog also keeps it in the focus trap
-									 * (DEVEX-780).
-									 */}
 									<ComboboxContent
 										disablePortal
 										className="max-w-none min-w-[min(100%,320px)]"