Skip to content
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.

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

Ensure disabled invisible buttons have the right text color. #3185

Merged
merged 13 commits into from
Apr 18, 2023
Merged
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions generated/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@
{
"name": "direction",
"type": "'n' | 'ne' | 'e' | 'se' | 's' | 'sw' | 'w' | 'nw'",
"defaultValue": "n",
"description": "Sets where the tooltip renders in relation to the target."
},
{
Expand Down
6 changes: 6 additions & 0 deletions src/Button/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 8 additions & 0 deletions src/__tests__/__snapshots__/Button.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 24 additions & 0 deletions src/__tests__/__snapshots__/TextInput.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down