From 2cd38be32bffb9e3b7015f16a9cac7ad897e23c7 Mon Sep 17 00:00:00 2001
From: Aravindo Wingeier <wingeier@adobe.com>
Date: Fri, 8 Aug 2025 13:37:55 -0700
Subject: [PATCH 1/4] feat: GS-17937: add support for XL Dialog

---
 packages/@react-spectrum/s2/src/Dialog.tsx | 2 +-
 packages/@react-spectrum/s2/src/Modal.tsx  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/Dialog.tsx b/packages/@react-spectrum/s2/src/Dialog.tsx
index a158d4574bd..e1eee02e4aa 100644
--- a/packages/@react-spectrum/s2/src/Dialog.tsx
+++ b/packages/@react-spectrum/s2/src/Dialog.tsx
@@ -33,7 +33,7 @@ export interface DialogProps extends Omit<RACDialogProps, 'className' | 'style'
    *
    * @default 'M'
    */
-  size?: 'S' | 'M' | 'L',
+  size?: 'S' | 'M' | 'L' | 'XL',
   /** Whether pressing the escape key to close the dialog should be disabled. */
   isKeyboardDismissDisabled?: boolean
 }
diff --git a/packages/@react-spectrum/s2/src/Modal.tsx b/packages/@react-spectrum/s2/src/Modal.tsx
index 67913f99699..9ce1343d776 100644
--- a/packages/@react-spectrum/s2/src/Modal.tsx
+++ b/packages/@react-spectrum/s2/src/Modal.tsx
@@ -24,7 +24,7 @@ interface ModalProps extends ModalOverlayProps {
    *
    * @default 'M'
    */
-  size?: 'S' | 'M' | 'L' | 'fullscreen' | 'fullscreenTakeover'
+  size?: 'S' | 'M' | 'L' | 'XL' | 'fullscreen' | 'fullscreenTakeover'
 }
 
 const modalOverlayStyles = style({
@@ -86,6 +86,7 @@ export const Modal = forwardRef(function Modal(props: ModalProps, ref: DOMRef<HT
               S: 400,
               M: 480,
               L: 640,
+              XL: 944,
               fullscreen: 'calc(100% - 40px)',
               fullscreenTakeover: 'full'
             }

From 1aa5db029030960fdc679f4f3fa46aac0096a41e Mon Sep 17 00:00:00 2001
From: Aravindo Wingeier <wingeier@adobe.com>
Date: Tue, 23 Sep 2025 15:46:51 -0700
Subject: [PATCH 2/4] XL=960 is the magic number

---
 packages/@react-spectrum/s2/src/Modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/s2/src/Modal.tsx b/packages/@react-spectrum/s2/src/Modal.tsx
index 9ce1343d776..b6b04a4094e 100644
--- a/packages/@react-spectrum/s2/src/Modal.tsx
+++ b/packages/@react-spectrum/s2/src/Modal.tsx
@@ -86,7 +86,7 @@ export const Modal = forwardRef(function Modal(props: ModalProps, ref: DOMRef<HT
               S: 400,
               M: 480,
               L: 640,
-              XL: 944,
+              XL: 960,
               fullscreen: 'calc(100% - 40px)',
               fullscreenTakeover: 'full'
             }

From 849c58c93d40775e681ce753e68d9fa9708dc84e Mon Sep 17 00:00:00 2001
From: Aravindo Wingeier <wingeier@adobe.com>
Date: Tue, 23 Sep 2025 15:58:20 -0700
Subject: [PATCH 3/4] fix indention

---
 packages/@react-spectrum/s2/src/Modal.tsx | 40 +++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/Modal.tsx b/packages/@react-spectrum/s2/src/Modal.tsx
index db9fa070f51..86b9ae44b22 100644
--- a/packages/@react-spectrum/s2/src/Modal.tsx
+++ b/packages/@react-spectrum/s2/src/Modal.tsx
@@ -104,25 +104,25 @@ export const Modal = forwardRef(function Modal(props: ModalProps, ref: DOMRef<HT
                 M: 480,
                 L: 640,
                 XL: 960,
-              fullscreen: 'calc(100% - 40px)',
-              fullscreenTakeover: 'full'
-            }
-          },
-          height: {
-            size: {
-              fullscreen: 'calc(100% - 40px)',
-              fullscreenTakeover: 'full'
-            }
-          },
-          maxWidth: {
-            default: '90vw',
-            size: {
-              fullscreen: 'none',
-              fullscreenTakeover: 'none'
-            }
-          },
-          maxHeight: {
-            default: '90%',
+                fullscreen: 'calc(100% - 40px)',
+                fullscreenTakeover: 'full'
+              }
+            },
+            height: {
+              size: {
+                fullscreen: 'calc(100% - 40px)',
+                fullscreenTakeover: 'full'
+              }
+            },
+            maxWidth: {
+              default: '90vw',
+              size: {
+                fullscreen: 'none',
+                fullscreenTakeover: 'none'
+              }
+            },
+            maxHeight: {
+              default: '90%',
               size: {
                 fullscreen: 'none',
                 fullscreenTakeover: 'none'
@@ -159,7 +159,7 @@ export const Modal = forwardRef(function Modal(props: ModalProps, ref: DOMRef<HT
             outlineStyle: 'solid',
             outlineWidth: 1,
             outlineColor: 'transparent'
-          })({...renderProps, size: props.size})} />
+          })({...renderProps, size: props.size})}/>
       </div>
     </ModalOverlay>
   );

From 9187bee74258ff779c63661ada923707116268a9 Mon Sep 17 00:00:00 2001
From: Aravindo Wingeier <wingeier@adobe.com>
Date: Tue, 23 Sep 2025 15:58:47 -0700
Subject: [PATCH 4/4] fix spacing

---
 packages/@react-spectrum/s2/src/Modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/s2/src/Modal.tsx b/packages/@react-spectrum/s2/src/Modal.tsx
index 86b9ae44b22..018f16789de 100644
--- a/packages/@react-spectrum/s2/src/Modal.tsx
+++ b/packages/@react-spectrum/s2/src/Modal.tsx
@@ -159,7 +159,7 @@ export const Modal = forwardRef(function Modal(props: ModalProps, ref: DOMRef<HT
             outlineStyle: 'solid',
             outlineWidth: 1,
             outlineColor: 'transparent'
-          })({...renderProps, size: props.size})}/>
+          })({...renderProps, size: props.size})} />
       </div>
     </ModalOverlay>
   );