From ec0f952b8bf77ecc418b0c81ce7eeb149909c916 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Wed, 20 May 2026 14:51:40 -0700
Subject: [PATCH 1/3] fix: enable keyboard scrolling in S2 Popover when content
 overflows

---
 packages/@react-spectrum/s2/src/Popover.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx
index 6ead949d693..5eef1255cc3 100644
--- a/packages/@react-spectrum/s2/src/Popover.tsx
+++ b/packages/@react-spectrum/s2/src/Popover.tsx
@@ -98,12 +98,13 @@ let popover = style(
       default: 'elevated',
       isArrowShown: 'none'
     },
-    outlineStyle: 'solid',
-    outlineWidth: 1,
-    outlineColor: {
+    borderStyle: 'solid',
+    borderWidth: 1,
+    borderColor: {
       default: lightDark('transparent-white-25', 'gray-200'),
       forcedColors: 'ButtonBorder'
     },
+    outlineStyle: 'none',
     width: {
       size: {
         // Copied from designs, not sure if correct.
@@ -154,7 +155,8 @@ let popover = style(
     isolation: 'isolate',
     pointerEvents: {
       isExiting: 'none'
-    }
+    },
+    overflow: 'auto'
   },
   getAllowedOverrides()
 );
@@ -322,10 +324,10 @@ const innerDivStyle = style(
     boxSizing: 'border-box',
     outlineStyle: 'none',
     borderRadius: 'inherit',
-    overflow: 'auto',
+    // overflow: 'auto',
     position: 'relative',
     width: 'full',
-    maxSize: 'inherit'
+    maxSize: 'inherit',
   },
   getAllowedOverrides({height: true})
 );

From 7657f46d9cff3fd33e256792cb7522145f61cc7d Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Wed, 20 May 2026 14:52:03 -0700
Subject: [PATCH 2/3] fix formatting

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

diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx
index 5eef1255cc3..a2e611aed9b 100644
--- a/packages/@react-spectrum/s2/src/Popover.tsx
+++ b/packages/@react-spectrum/s2/src/Popover.tsx
@@ -327,7 +327,7 @@ const innerDivStyle = style(
     // overflow: 'auto',
     position: 'relative',
     width: 'full',
-    maxSize: 'inherit',
+    maxSize: 'inherit'
   },
   getAllowedOverrides({height: true})
 );

From 58b074e4fd732c3975d1b49b23f878c6cfeaf1a8 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Wed, 20 May 2026 15:02:10 -0700
Subject: [PATCH 3/3] cleanup

---
 packages/@react-spectrum/s2/src/Popover.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx
index a2e611aed9b..4eec2d1cbb3 100644
--- a/packages/@react-spectrum/s2/src/Popover.tsx
+++ b/packages/@react-spectrum/s2/src/Popover.tsx
@@ -324,7 +324,6 @@ const innerDivStyle = style(
     boxSizing: 'border-box',
     outlineStyle: 'none',
     borderRadius: 'inherit',
-    // overflow: 'auto',
     position: 'relative',
     width: 'full',
     maxSize: 'inherit'