From 25df95ab6e6ba9f0932aafa4efc5619670e9b8cd Mon Sep 17 00:00:00 2001
From: Katie Langerman <18661030+langermank@users.noreply.github.com>
Date: Tue, 15 Oct 2024 10:32:24 -0700
Subject: [PATCH 1/3] add support for aria-disabled

---
 packages/react/src/Button/Button.stories.tsx   |  6 ++++++
 .../react/src/Button/ButtonBase.module.css     | 18 ++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/react/src/Button/Button.stories.tsx b/packages/react/src/Button/Button.stories.tsx
index ce55f4fcbdb..975b46910da 100644
--- a/packages/react/src/Button/Button.stories.tsx
+++ b/packages/react/src/Button/Button.stories.tsx
@@ -26,6 +26,11 @@ Playground.argTypes = {
       type: 'boolean',
     },
   },
+  'aria-disabled': {
+    control: {
+      type: 'boolean',
+    },
+  },
   inactive: {
     control: {
       type: 'boolean',
@@ -79,6 +84,7 @@ Playground.args = {
   leadingVisual: null,
   trailingAction: null,
   labelWrap: false,
+  'aria-disabled': false,
 }
 
 export const Default = () => <Button>Default</Button>
diff --git a/packages/react/src/Button/ButtonBase.module.css b/packages/react/src/Button/ButtonBase.module.css
index f4bfb4d1dc1..27d2a66cb1b 100644
--- a/packages/react/src/Button/ButtonBase.module.css
+++ b/packages/react/src/Button/ButtonBase.module.css
@@ -36,7 +36,8 @@
     transition: none;
   }
 
-  &:disabled {
+  &:disabled,
+  &[aria-disabled='true'] {
     cursor: not-allowed;
     box-shadow: none;
 
@@ -263,7 +264,8 @@
       border-color: var(--button-default-borderColor-active);
     }
 
-    &:disabled {
+    &:disabled,
+    &[aria-disabled='true'] {
       color: var(--control-fgColor-disabled);
       background-color: var(--button-default-bgColor-disabled);
       border-color: var(--button-default-borderColor-disabled);
@@ -306,7 +308,8 @@
       box-shadow: var(--button-primary-shadow-selected);
     }
 
-    &:disabled {
+    &:disabled,
+    &[aria-disabled='true'] {
       color: var(--button-primary-fgColor-disabled);
       background-color: var(--button-primary-bgColor-disabled);
       border-color: var(--button-primary-borderColor-disabled);
@@ -374,7 +377,8 @@
       }
     }
 
-    &:disabled {
+    &:disabled,
+    &[aria-disabled='true'] {
       color: var(--button-danger-fgColor-disabled);
       background-color: var(--button-danger-bgColor-disabled);
       border-color: var(--button-default-borderColor-disabled);
@@ -423,7 +427,8 @@
       }
     }
 
-    &:disabled {
+    &:disabled,
+    &[aria-disabled='true'] {
       color: var(--button-invisible-fgColor-disabled);
       background-color: var(--button-invisible-bgColor-disabled);
       border-color: var(--button-invisible-borderColor-disabled);
@@ -464,7 +469,8 @@
       outline-offset: 2px;
     }
 
-    &:disabled {
+    &:disabled,
+    &[aria-disabled='true'] {
       color: var(--control-fgColor-disabled);
       background-color: transparent;
       border-color: transparent;

From dc95ca89fbc3e8cddc12ae8d8870e89af2ec4f8b Mon Sep 17 00:00:00 2001
From: Katie Langerman <18661030+langermank@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:49:21 -0700
Subject: [PATCH 2/3] fix

---
 packages/react/src/Button/ButtonBase.module.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react/src/Button/ButtonBase.module.css b/packages/react/src/Button/ButtonBase.module.css
index 27d2a66cb1b..d3f531f47a3 100644
--- a/packages/react/src/Button/ButtonBase.module.css
+++ b/packages/react/src/Button/ButtonBase.module.css
@@ -37,7 +37,7 @@
   }
 
   &:disabled,
-  &[aria-disabled='true'] {
+  &[aria-disabled='true']:not([data-loading='true']) {
     cursor: not-allowed;
     box-shadow: none;
 
@@ -265,7 +265,7 @@
     }
 
     &:disabled,
-    &[aria-disabled='true'] {
+    &[aria-disabled='true']:not([data-loading='true']) {
       color: var(--control-fgColor-disabled);
       background-color: var(--button-default-bgColor-disabled);
       border-color: var(--button-default-borderColor-disabled);
@@ -309,7 +309,7 @@
     }
 
     &:disabled,
-    &[aria-disabled='true'] {
+    &[aria-disabled='true']:not([data-loading='true']) {
       color: var(--button-primary-fgColor-disabled);
       background-color: var(--button-primary-bgColor-disabled);
       border-color: var(--button-primary-borderColor-disabled);
@@ -378,7 +378,7 @@
     }
 
     &:disabled,
-    &[aria-disabled='true'] {
+    &[aria-disabled='true']:not([data-loading='true']) {
       color: var(--button-danger-fgColor-disabled);
       background-color: var(--button-danger-bgColor-disabled);
       border-color: var(--button-default-borderColor-disabled);
@@ -428,7 +428,7 @@
     }
 
     &:disabled,
-    &[aria-disabled='true'] {
+    &[aria-disabled='true']:not([data-loading='true']) {
       color: var(--button-invisible-fgColor-disabled);
       background-color: var(--button-invisible-bgColor-disabled);
       border-color: var(--button-invisible-borderColor-disabled);
@@ -470,7 +470,7 @@
     }
 
     &:disabled,
-    &[aria-disabled='true'] {
+    &[aria-disabled='true']:not([data-loading='true']) {
       color: var(--control-fgColor-disabled);
       background-color: transparent;
       border-color: transparent;

From 4cc4b47fe3f74ade6d6a319b46b38180ad46ce24 Mon Sep 17 00:00:00 2001
From: Katie Langerman <18661030+langermank@users.noreply.github.com>
Date: Tue, 15 Oct 2024 12:17:59 -0700
Subject: [PATCH 3/3] Create grumpy-hairs-look.md

---
 .changeset/grumpy-hairs-look.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/grumpy-hairs-look.md

diff --git a/.changeset/grumpy-hairs-look.md b/.changeset/grumpy-hairs-look.md
new file mode 100644
index 00000000000..d48e0603b40
--- /dev/null
+++ b/.changeset/grumpy-hairs-look.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Add support for `aria-disabled` in `Button`