From afc5d76fd03c2409213220eaefcc1dd186e3d544 Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Thu, 30 Jan 2025 11:47:24 -0800
Subject: [PATCH 1/2] fix: top/left align icon in s2 badge

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

diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx
index 5b79aeb0868..cf7f1212208 100644
--- a/packages/@react-spectrum/s2/src/Badge.tsx
+++ b/packages/@react-spectrum/s2/src/Badge.tsx
@@ -61,7 +61,7 @@ const badge = style<BadgeStyleProps>({
   display: 'flex',
   font: 'control',
   justifyContent: 'center',
-  alignItems: 'center',
+  alignItems: 'baseline',
   borderRadius: 'control',
   minHeight: 'control',
   paddingX: {

From 55a44c9c5da7fc112d6623ddccc4d1eb2cab2b0a Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Thu, 30 Jan 2025 13:09:48 -0800
Subject: [PATCH 2/2] center icon only badge

---
 packages/@react-spectrum/s2/src/Badge.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx
index cf7f1212208..b27ae77a90f 100644
--- a/packages/@react-spectrum/s2/src/Badge.tsx
+++ b/packages/@react-spectrum/s2/src/Badge.tsx
@@ -61,7 +61,10 @@ const badge = style<BadgeStyleProps>({
   display: 'flex',
   font: 'control',
   justifyContent: 'center',
-  alignItems: 'baseline',
+  alignItems: {
+    default: 'baseline',
+    ':has([slot=icon]:only-child)': 'center'
+  },
   borderRadius: 'control',
   minHeight: 'control',
   paddingX: {