From d3e04611e633083a93244d7806db8ce9f36fa315 Mon Sep 17 00:00:00 2001
From: Ian Sanders <iansan5653@github.com>
Date: Fri, 22 Mar 2024 17:49:45 +0000
Subject: [PATCH 1/3] Allow user to override button `aria-disabled`

---
 packages/react/src/Button/ButtonBase.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/Button/ButtonBase.tsx b/packages/react/src/Button/ButtonBase.tsx
index eb1692c8a35..8458ecd8ad5 100644
--- a/packages/react/src/Button/ButtonBase.tsx
+++ b/packages/react/src/Button/ButtonBase.tsx
@@ -89,6 +89,7 @@ const ButtonBase = forwardRef(
         <StyledButton
           as={Component}
           sx={sxStyles}
+          aria-disabled={loading ? true : undefined}
           {...rest}
           ref={innerRef}
           data-block={block ? 'block' : null}
@@ -96,7 +97,6 @@ const ButtonBase = forwardRef(
           data-loading={Boolean(loading)}
           data-no-visuals={!LeadingVisual && !TrailingVisual && !TrailingAction ? true : undefined}
           data-size={size === 'small' || size === 'large' ? size : undefined}
-          aria-disabled={loading ? true : undefined}
           aria-describedby={[loadingAnnouncementID, ariaDescribedBy]
             .filter(descriptionID => Boolean(descriptionID))
             .join(' ')}

From 1d92fe2d44ad1a84585e1a55e05153aae4efa3a6 Mon Sep 17 00:00:00 2001
From: Ian Sanders <iansan5653@github.com>
Date: Fri, 22 Mar 2024 18:10:10 +0000
Subject: [PATCH 2/3] Add test

---
 packages/react/src/Button/__tests__/Button.test.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/react/src/Button/__tests__/Button.test.tsx b/packages/react/src/Button/__tests__/Button.test.tsx
index 04c567e6480..97a29b04c90 100644
--- a/packages/react/src/Button/__tests__/Button.test.tsx
+++ b/packages/react/src/Button/__tests__/Button.test.tsx
@@ -238,6 +238,12 @@ describe('Button', () => {
     }, 0)
   })
 
+  it('allows the consumer to override `aria-disabled`', () => {
+    const container = render(<Button aria-disabled>content</Button>)
+
+    expect(container.getByRole('button')).toHaveAttribute('aria-disabled', 'true')
+  })
+
   it('should preserve the accessible button name when the button is in a loading state', () => {
     const container = render(<Button loading>content</Button>)
 

From 72489550ead7be8162f6343cfcdf4db5d82e15c0 Mon Sep 17 00:00:00 2001
From: Ian Sanders <iansan5653@github.com>
Date: Fri, 22 Mar 2024 18:12:11 +0000
Subject: [PATCH 3/3] Add changeset

---
 .changeset/smart-cameras-sip.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/smart-cameras-sip.md

diff --git a/.changeset/smart-cameras-sip.md b/.changeset/smart-cameras-sip.md
new file mode 100644
index 00000000000..3d7095b91b7
--- /dev/null
+++ b/.changeset/smart-cameras-sip.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+Fixes a bug where consumers cannot override buttons' aria-disabled attribute