From 1b183c9c1513695c4297f7d00aa1e1674d31cebc Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Wed, 13 Aug 2025 15:14:53 -0700
Subject: [PATCH 1/2] fix: add role to react aria taggroup when empty

---
 packages/@react-aria/tag/src/useTagGroup.ts            |  2 +-
 .../react-aria-components/stories/TagGroup.stories.tsx | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/@react-aria/tag/src/useTagGroup.ts b/packages/@react-aria/tag/src/useTagGroup.ts
index 745325bcaf2..11b32c9508a 100644
--- a/packages/@react-aria/tag/src/useTagGroup.ts
+++ b/packages/@react-aria/tag/src/useTagGroup.ts
@@ -114,7 +114,7 @@ export function useTagGroup<T>(props: AriaTagGroupOptions<T>, state: ListState<T
 
   return {
     gridProps: mergeProps(gridProps, domProps, {
-      role: state.collection.size ? 'grid' : null,
+      role: state.collection.size ? 'grid' : 'group',
       'aria-atomic': false,
       'aria-relevant': 'additions',
       'aria-live': isFocusWithin ? 'polite' : 'off',
diff --git a/packages/react-aria-components/stories/TagGroup.stories.tsx b/packages/react-aria-components/stories/TagGroup.stories.tsx
index 3b925421906..caf662e9126 100644
--- a/packages/react-aria-components/stories/TagGroup.stories.tsx
+++ b/packages/react-aria-components/stories/TagGroup.stories.tsx
@@ -111,3 +111,13 @@ export const TagGroupExampleWithRemove: Story = {
     </TagGroup>
   )
 };
+
+export const EmptyTagGroup: Story = {
+  render: (props: TagGroupProps) => (
+    <TagGroup {...props} aria-label="Categories" >
+      <TagList renderEmptyState={() => 'No categories.'}>
+        {[]}
+      </TagList>
+    </TagGroup>
+  )
+};

From 21dcb01a3310bf08b1500673c1beec88daf8419c Mon Sep 17 00:00:00 2001
From: Yihui Liao <44729383+yihuiliao@users.noreply.github.com>
Date: Wed, 13 Aug 2025 15:28:41 -0700
Subject: [PATCH 2/2] add test

---
 packages/react-aria-components/test/TagGroup.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-aria-components/test/TagGroup.test.js b/packages/react-aria-components/test/TagGroup.test.js
index d227029294f..2dad220810a 100644
--- a/packages/react-aria-components/test/TagGroup.test.js
+++ b/packages/react-aria-components/test/TagGroup.test.js
@@ -306,6 +306,7 @@ describe('TagGroup', () => {
     let grid = getByTestId('list');
     expect(grid).toHaveAttribute('data-empty', 'true');
     expect(grid).toHaveTextContent('No results');
+    expect(grid).toHaveAttribute('role', 'group');
   });
 
   it('supports tooltips', async function () {