From b74422c7a1260b0ce376ab6961a6548316f4b86d Mon Sep 17 00:00:00 2001
From: Akseli Nurmio <akseli.nurmio@yle.fi>
Date: Tue, 22 Oct 2024 12:38:53 +0300
Subject: [PATCH] [ToggleGroup] fix: correct role for single toggle group

---
 .yarn/versions/fa6477bc.yml                          | 6 ++++++
 packages/react/toggle-group/src/ToggleGroup.test.tsx | 8 ++++++++
 packages/react/toggle-group/src/ToggleGroup.tsx      | 6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 .yarn/versions/fa6477bc.yml

diff --git a/.yarn/versions/fa6477bc.yml b/.yarn/versions/fa6477bc.yml
new file mode 100644
index 0000000000..2da6789f7e
--- /dev/null
+++ b/.yarn/versions/fa6477bc.yml
@@ -0,0 +1,6 @@
+releases:
+  "@radix-ui/react-toggle-group": patch
+  "@radix-ui/react-toolbar": patch
+
+declined:
+  - primitives
diff --git a/packages/react/toggle-group/src/ToggleGroup.test.tsx b/packages/react/toggle-group/src/ToggleGroup.test.tsx
index bca1640e01..7c6552422e 100644
--- a/packages/react/toggle-group/src/ToggleGroup.test.tsx
+++ b/packages/react/toggle-group/src/ToggleGroup.test.tsx
@@ -29,6 +29,10 @@ describe('given a single ToggleGroup', () => {
       expect(await axe(rendered.container)).toHaveNoViolations();
     });
 
+    it('should have radiogroup role', () => {
+      expect(rendered.getByRole('radiogroup')).toBeInTheDocument();
+    });
+
     it('should change value to `One`', () => {
       expect(handleValueChange).toHaveBeenCalledWith('One');
     });
@@ -72,6 +76,10 @@ describe('given a multiple ToggleGroup', () => {
     expect(await axe(rendered.container)).toHaveNoViolations();
   });
 
+  it('should have group role', () => {
+    expect(rendered.getByRole('group')).toBeInTheDocument();
+  });
+
   describe('when clicking `One`', () => {
     beforeEach(() => {
       fireEvent.click(one);
diff --git a/packages/react/toggle-group/src/ToggleGroup.tsx b/packages/react/toggle-group/src/ToggleGroup.tsx
index 71fe81c0e1..3c922282c7 100644
--- a/packages/react/toggle-group/src/ToggleGroup.tsx
+++ b/packages/react/toggle-group/src/ToggleGroup.tsx
@@ -37,12 +37,12 @@ const ToggleGroup = React.forwardRef<
 
   if (type === 'single') {
     const singleProps = toggleGroupProps as ToggleGroupImplSingleProps;
-    return <ToggleGroupImplSingle {...singleProps} ref={forwardedRef} />;
+    return <ToggleGroupImplSingle role="radiogroup" {...singleProps} ref={forwardedRef} />;
   }
 
   if (type === 'multiple') {
     const multipleProps = toggleGroupProps as ToggleGroupImplMultipleProps;
-    return <ToggleGroupImplMultiple {...multipleProps} ref={forwardedRef} />;
+    return <ToggleGroupImplMultiple role="group" {...multipleProps} ref={forwardedRef} />;
   }
 
   throw new Error(`Missing prop \`type\` expected on \`${TOGGLE_GROUP_NAME}\``);
@@ -208,7 +208,7 @@ const ToggleGroupImpl = React.forwardRef<ToggleGroupImplElement, ToggleGroupImpl
     } = props;
     const rovingFocusGroupScope = useRovingFocusGroupScope(__scopeToggleGroup);
     const direction = useDirection(dir);
-    const commonProps = { role: 'group', dir: direction, ...toggleGroupProps };
+    const commonProps = { dir: direction, ...toggleGroupProps };
     return (
       <ToggleGroupContext scope={__scopeToggleGroup} rovingFocus={rovingFocus} disabled={disabled}>
         {rovingFocus ? (