From ba131664a838de51691676efb01f19f915e6c12d Mon Sep 17 00:00:00 2001
From: Steve Dodier-Lazaro <sidnioulz@gmail.com>
Date: Mon, 2 Mar 2026 12:04:26 +0100
Subject: [PATCH] UI: Fix modal text selection

---
 .../components/GlobalErrorModal.stories.tsx   |  2 +-
 .../src/components/GlobalErrorModal.tsx       |  5 ++--
 .../src/components/components/Modal/Modal.tsx | 29 ++++++++++---------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/code/addons/vitest/src/components/GlobalErrorModal.stories.tsx b/code/addons/vitest/src/components/GlobalErrorModal.stories.tsx
index 394e9e052dcb..c1c35c19921a 100644
--- a/code/addons/vitest/src/components/GlobalErrorModal.stories.tsx
+++ b/code/addons/vitest/src/components/GlobalErrorModal.stories.tsx
@@ -81,7 +81,7 @@ export const FatalError: Story = {
     const canvas = within(canvasElement.parentElement!);
     const button = canvas.getByText('Open modal');
     await userEvent.click(button);
-    await expect(canvas.findByText('Storybook Tests error details')).resolves.toBeInTheDocument();
+    await expect(canvas.findByText('Storybook Test Error Details')).resolves.toBeInTheDocument();
   },
 };
 
diff --git a/code/addons/vitest/src/components/GlobalErrorModal.tsx b/code/addons/vitest/src/components/GlobalErrorModal.tsx
index f92ee795a987..686f6cea57db 100644
--- a/code/addons/vitest/src/components/GlobalErrorModal.tsx
+++ b/code/addons/vitest/src/components/GlobalErrorModal.tsx
@@ -31,6 +31,7 @@ const ModalTitle = styled(Modal.Title)(({ theme: { typography } }) => ({
 const ModalStackTrace = styled.pre(({ theme }) => ({
   whiteSpace: 'pre-wrap',
   wordWrap: 'break-word',
+  userSelect: 'text',
   overflow: 'auto',
   maxHeight: '60vh',
   margin: 0,
@@ -147,9 +148,9 @@ export function GlobalErrorModal({ onRerun, storeState }: GlobalErrorModalProps)
   ) : null;
 
   return (
-    <Modal ariaLabel="Storybook Tests error details" onOpenChange={setModalOpen} open={isModalOpen}>
+    <Modal ariaLabel="Storybook Test Error Details" onOpenChange={setModalOpen} open={isModalOpen}>
       <ModalBar>
-        <ModalTitle>Storybook Tests error details</ModalTitle>
+        <ModalTitle>Storybook Test Error Details</ModalTitle>
         <ModalActionBar>
           <Button onClick={onRerun} variant="ghost" ariaLabel={false}>
             <SyncIcon />
diff --git a/code/core/src/components/components/Modal/Modal.tsx b/code/core/src/components/components/Modal/Modal.tsx
index b2f734ae30db..513c45ce2f82 100644
--- a/code/core/src/components/components/Modal/Modal.tsx
+++ b/code/core/src/components/components/Modal/Modal.tsx
@@ -216,19 +216,22 @@ function BaseModal({
         />
         <div role="dialog" aria-label={ariaLabel} ref={overlayRef} {...finalModalProps}>
           <ModalContext.Provider value={{ close }}>
-            {/* We need to set the FocusScope ourselves somehow, Overlay won't set it. */}
-            <Components.Container
-              data-deprecated={deprecated}
-              $variant={variant}
-              $status={status}
-              $transitionDuration={transitionDuration}
-              className={className}
-              width={width}
-              height={height}
-              {...props}
-            >
-              {children}
-            </Components.Container>
+            {/* This div exists to help the FocusScope, see https://github.com/adobe/react-spectrum/issues/1604. */}
+            <div tabIndex={-1}>
+              {/* We need to set the FocusScope ourselves somehow, Overlay won't set it. */}
+              <Components.Container
+                data-deprecated={deprecated}
+                $variant={variant}
+                $status={status}
+                $transitionDuration={transitionDuration}
+                className={className}
+                width={width}
+                height={height}
+                {...props}
+              >
+                {children}
+              </Components.Container>
+            </div>
           </ModalContext.Provider>
         </div>
       </FocusScope>