Merge 0d8f221 into 2b14779

primer · Apr 18, 2023 · 5eca63f · 5eca63f
2 parents 2b14779 + 0d8f221
commit 5eca63f
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 0 deletions.
diff --git a/...nts/IconButton.test.ts-snapshots/IconButton-Invisible-dark-colorblind-linux.png b/...nts/IconButton.test.ts-snapshots/IconButton-Invisible-dark-colorblind-linux.png
diff --git a/...nts/IconButton.test.ts-snapshots/IconButton-Invisible-dark-tritanopia-linux.png b/...nts/IconButton.test.ts-snapshots/IconButton-Invisible-dark-tritanopia-linux.png
diff --git a/...ts/components/IconButton.test.ts-snapshots/IconButton-Invisible-light-linux.png b/...ts/components/IconButton.test.ts-snapshots/IconButton-Invisible-light-linux.png
diff --git a/...r.test.ts-snapshots/PageHeader-With-Leading-and-Trailing-Actions-dark-linux.png b/...r.test.ts-snapshots/PageHeader-With-Leading-and-Trailing-Actions-dark-linux.png
diff --git a/....test.ts-snapshots/PageHeader-With-Leading-and-Trailing-Actions-light-linux.png b/....test.ts-snapshots/PageHeader-With-Leading-and-Trailing-Actions-light-linux.png
diff --git a/...nents/TextInput.test.ts-snapshots/TextInput-With-Trailing-Action-dark-linux.png b/...nents/TextInput.test.ts-snapshots/TextInput-With-Trailing-Action-dark-linux.png
diff --git a/...ents/TextInput.test.ts-snapshots/TextInput-With-Trailing-Action-light-linux.png b/...ents/TextInput.test.ts-snapshots/TextInput-With-Trailing-Action-light-linux.png
diff --git a/src/Button/styles.ts b/src/Button/styles.ts
@@ -136,6 +136,12 @@ export const getVariantStyles = (variant: VariantType = 'default', theme?: Theme
       '&:has([data-component="ButtonCounter"])': {
         color: 'accent.fg',
       },
+      '&:disabled[data-no-visuals]': {
+        color: 'primer.fg.disabled',
+        '[data-component=ButtonCounter]': {
+          color: 'inherit',
+        },
+      },
     },
     outline: {
       color: 'btn.outline.text',

diff --git a/src/__tests__/__snapshots__/Button.test.tsx.snap b/src/__tests__/__snapshots__/Button.test.tsx.snap
@@ -1627,6 +1627,14 @@ exports[`Button styles invisible button appropriately 1`] = `
   color: accent.fg;
 }
 
+.c0:disabled[data-no-visuals] {
+  color: primer.fg.disabled;
+}
+
+.c0:disabled[data-no-visuals] [data-component=ButtonCounter] {
+  color: inherit;
+}
+
 @media (forced-colors:active) {
   .c0:focus {
     outline: solid 1px transparent;

diff --git a/src/__tests__/__snapshots__/TextInput.test.tsx.snap b/src/__tests__/__snapshots__/TextInput.test.tsx.snap
@@ -1469,6 +1469,14 @@ exports[`TextInput renders trailingAction icon button 1`] = `
   color: #0969da;
 }
 
+.c4:disabled[data-no-visuals] {
+  color: #8c959f;
+}
+
+.c4:disabled[data-no-visuals] [data-component=ButtonCounter] {
+  color: inherit;
+}
+
 .c4[data-size="small"][data-no-visuals="true"] {
   padding-top: 2px;
   padding-right: 4px;
@@ -2108,6 +2116,14 @@ exports[`TextInput renders trailingAction text button 1`] = `
   color: #0969da;
 }
 
+.c3:disabled[data-no-visuals] {
+  color: #8c959f;
+}
+
+.c3:disabled[data-no-visuals] [data-component=ButtonCounter] {
+  color: inherit;
+}
+
 .c3[data-no-visuals="true"] {
   padding-top: 2px;
   padding-right: 4px;
@@ -2502,6 +2518,14 @@ exports[`TextInput renders trailingAction text button with a tooltip 1`] = `
   color: #0969da;
 }
 
+.c4:disabled[data-no-visuals] {
+  color: #8c959f;
+}
+
+.c4:disabled[data-no-visuals] [data-component=ButtonCounter] {
+  color: inherit;
+}
+
 .c4[data-no-visuals="true"] {
   padding-top: 2px;
   padding-right: 4px;