Skip to content

Correct disabled Button icon fill colors#3368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mperrotti merged 4 commits into from
Jun 7, 2023
Merged

Correct disabled Button icon fill colors #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d847667
corrects disabled button icon colors
mperrotti Jun 5, 2023
f3c2341
Create dry-olives-rule.md
mperrotti Jun 5, 2023
9a9fd9d
Merge branch 'main' into mp/correct-disabled-btn-icon-colors
mperrotti Jun 6, 2023
80f0160
Merge branch 'main' into mp/correct-disabled-btn-icon-colors
mperrotti Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dry-olives-rule.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Correct disabled Button icon fill colors
2 changes: 1 addition & 1 deletion src/Button/styles.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ export const getVariantStyles = (variant: VariantType = 'default', theme?: Theme
},
'&:disabled': {
color: 'primer.fg.disabled',
'[data-component=ButtonCounter]': {
'[data-component=ButtonCounter], [data-component="leadingVisual"], [data-component="trailingAction"]': {
color: 'inherit',
},
},
Expand Down
4 changes: 3 additions & 1 deletion src/__tests__/__snapshots__/Button.test.tsx.snap
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1504,7 +1504,9 @@ exports[`Button styles invisible button appropriately 1`] = `
color: primer.fg.disabled;
}

.c0:disabled [data-component=ButtonCounter] {
.c0:disabled [data-component=ButtonCounter],
.c0:disabled [data-component="leadingVisual"],
.c0:disabled [data-component="trailingAction"] {
color: inherit;
}

Expand Down
12 changes: 9 additions & 3 deletions src/__tests__/__snapshots__/TextInput.test.tsx.snap
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1336,7 +1336,9 @@ exports[`TextInput renders trailingAction icon button 1`] = `
color: #8c959f;
}

.c4:disabled [data-component=ButtonCounter] {
.c4:disabled [data-component=ButtonCounter],
.c4:disabled [data-component="leadingVisual"],
.c4:disabled [data-component="trailingAction"] {
color: inherit;
}

Expand DownExpand Up@@ -1982,7 +1984,9 @@ exports[`TextInput renders trailingAction text button 1`] = `
color: #8c959f;
}

.c3:disabled [data-component=ButtonCounter] {
.c3:disabled [data-component=ButtonCounter],
.c3:disabled [data-component="leadingVisual"],
.c3:disabled [data-component="trailingAction"] {
color: inherit;
}

Expand DownExpand Up@@ -2383,7 +2387,9 @@ exports[`TextInput renders trailingAction text button with a tooltip 1`] = `
color: #8c959f;
}

.c4:disabled [data-component=ButtonCounter] {
.c4:disabled [data-component=ButtonCounter],
.c4:disabled [data-component="leadingVisual"],
.c4:disabled [data-component="trailingAction"] {
color: inherit;
}

Expand Down