From 9c4c3f1f7bf3ec0ed7f6d33a54fb1dfe6bfaf024 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Thu, 11 Jun 2026 10:22:50 -0700
Subject: [PATCH 1/2] fix: update border radius with checkbox selection

---
 packages/@react-spectrum/s2/src/ListView.tsx | 38 +++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx
index 1e04f0bf2cc..a492761122c 100644
--- a/packages/@react-spectrum/s2/src/ListView.tsx
+++ b/packages/@react-spectrum/s2/src/ListView.tsx
@@ -549,6 +549,7 @@ const listRowBackground = style<
     isNextNotSelected?: boolean;
     selectionStyle?: 'highlight' | 'checkbox';
     isDropTarget?: boolean;
+    isNotSelected?: boolean;
   }
 >({
   position: 'absolute',
@@ -612,56 +613,40 @@ const listRowBackground = style<
     isQuiet: 'default',
     isSelected: 'none',
     isPrevNotSelected: {
-      isSelected: {
-        selectionStyle: {
-          checkbox: 'none',
-          highlight: insetBorderRadius
-        }
-      },
+      isSelected: insetBorderRadius,
       isQuiet: 'default'
     },
+    isNotSelected: insetBorderRadius,
     isDropTarget: insetBorderRadius
   },
   borderTopEndRadius: {
     isQuiet: 'default',
     isSelected: 'none',
     isPrevNotSelected: {
-      isSelected: {
-        selectionStyle: {
-          checkbox: 'none',
-          highlight: insetBorderRadius
-        }
-      },
+      isSelected: insetBorderRadius,
       isQuiet: 'default'
     },
-    isDropTarget: insetBorderRadius
+    isNotSelected: insetBorderRadius,
+    isDropTarget: insetBorderRadius,
   },
   borderBottomStartRadius: {
     isQuiet: 'default',
     isSelected: 'none',
     isNextNotSelected: {
-      isSelected: {
-        selectionStyle: {
-          checkbox: 'none',
-          highlight: insetBorderRadius
-        }
-      },
+      isSelected: insetBorderRadius,
       isQuiet: 'default'
     },
+    isNotSelected: insetBorderRadius,
     isDropTarget: insetBorderRadius
   },
   borderBottomEndRadius: {
     isQuiet: 'default',
     isSelected: 'none',
     isNextNotSelected: {
-      isSelected: {
-        selectionStyle: {
-          checkbox: 'none',
-          highlight: insetBorderRadius
-        }
-      },
+      isSelected: insetBorderRadius,
       isQuiet: 'default'
     },
+    isNotSelected: insetBorderRadius,
     isDropTarget: insetBorderRadius
   },
   borderTopWidth: {
@@ -965,7 +950,8 @@ export function ListViewItem(props: ListViewItemProps): ReactNode {
                   isPrevNotSelected: !isPrevSelected(id, state),
                   isNextNotSelected: !isNextSelected(id, state),
                   isFirstItem: isFirstItem(id, state),
-                  isLastItem: isLastItem(id, state)
+                  isLastItem: isLastItem(id, state),
+                  isNotSelected: !renderProps.isSelected
                 })}
               />
               {renderProps.isFocusVisible && (

From 5f372f50003c97d32363dc4540db68d071c51729 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Thu, 11 Jun 2026 10:53:54 -0700
Subject: [PATCH 2/2] fix lint

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

diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx
index a492761122c..5d7c8edc5f7 100644
--- a/packages/@react-spectrum/s2/src/ListView.tsx
+++ b/packages/@react-spectrum/s2/src/ListView.tsx
@@ -627,7 +627,7 @@ const listRowBackground = style<
       isQuiet: 'default'
     },
     isNotSelected: insetBorderRadius,
-    isDropTarget: insetBorderRadius,
+    isDropTarget: insetBorderRadius
   },
   borderBottomStartRadius: {
     isQuiet: 'default',