Skip to content

fix(clear button): align background color and hover state for disabled variant #3258

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
merged 6 commits into from
Oct 28, 2024
Merged

fix(clear button): align background color and hover state for disabled variant #3258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddb38d9
chore(clear button): resolve conflict
cdransf Oct 21, 2024
76e3f35
chore(clear button): adds changeset
cdransf Oct 22, 2024
e7b5610
chore(clear button): remove declaration + unnecessary stylelint
cdransf Oct 23, 2024
f6ed47f
chore(clear button): add .spectrum-ClearButton.is-disabled selector
cdransf Oct 24, 2024
92bb839
chore(clear button): add .spectrum-ClearButton--staticWhite selectors
cdransf Oct 24, 2024
1042098
chore(clear button): update changelog
cdransf Oct 28, 2024
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
11 changes: 11 additions & 0 deletions .changeset/silly-donkeys-remember.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@spectrum-css/clearbutton": minor
---

Improves the visibility of the clear button disabled variant on static color backgrounds by more closely aligning styles with close button.

- Adds `.spectrum-ClearButton--staticWhite` to the mod declarations associated with `.spectrum-ClearButton--overBackground` in advance of the latter being deprecated. The same class has been added to the `:focus` declaration for `spectrum-ClearButton--overBackground`.
- Adds `--spectrum-clear-button-icon-color-disabled: var(--spectrum-disabled-static-white-content-color);` custom property for `.spectrum-ClearButton--staticWhite`.
- Enables `cursor: pointer` for `.spectrum-ClearButton` when it is not disabled.
- Disables hover, active, focus and focus-within states for `:disabled` `.spectrum-ClearButton` elements.
- Adds color styles for `:disabled` and `.is-disabled` `.spectrum-ClearButton` `:disabled` icons.
28 changes: 23 additions & 5 deletions components/clearbutton/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
--mod-clear-button-background-color-key-focus: transparent;
}

/* @deprecated .spectrum-ClearButton--overBackground */
&.spectrum-ClearButton--staticWhite,
&.spectrum-ClearButton--overBackground {
--mod-clear-button-icon-color: var(--spectrum-white);
--mod-clear-button-icon-color-hover: var(--spectrum-white);
Expand All @@ -65,13 +67,20 @@
--mod-clear-button-icon-color-down: var(--spectrum-disabled-content-color);
--mod-clear-button-background-color: var(--mod-clear-button-background-color-disabled, transparent);
}

&.spectrum-ClearButton--staticWhite {
--spectrum-clear-button-icon-color-disabled: var(--spectrum-disabled-static-white-content-color);
}
}

.spectrum-ClearButton {
block-size: var(--mod-clear-button-height, var(--spectrum-clear-button-height));
inline-size: var(--mod-clear-button-width, var(--spectrum-clear-button-width));
border-radius: 100%;
cursor: pointer;

&:not(:disabled) {
cursor: pointer;
}

background-color: var(--mod-clear-button-background-color, transparent);
margin: 0;
Expand All @@ -86,24 +95,24 @@
margin-inline: auto;
}

&:hover {
&:not(:disabled):hover {
color: var(--highcontrast-clear-button-icon-color-hover, var(--mod-clear-button-icon-color-hover, var(--spectrum-clear-button-icon-color-hover)));

.spectrum-ClearButton-fill {
background-color: var(--mod-clear-button-background-color-hover, var(--spectrum-clear-button-background-color-hover));
}
}

&:active {
&:not(:disabled):active {
color: var(--mod-clear-button-icon-color-down, var(--spectrum-clear-button-icon-color-down));

.spectrum-ClearButton-fill {
background-color: var(--mod-clear-button-background-color-down, var(--spectrum-clear-button-background-color-down));
}
}

&:focus-visible,
&:focus-within {
&:not(:disabled):focus-visible,
&:not(:disabled):focus-within {
color: var(--mod-clear-button-icon-color-key-focus, var(--spectrum-clear-button-icon-color-key-focus));

.spectrum-ClearButton-fill {
Expand All @@ -112,6 +121,13 @@
}
}

.spectrum-ClearButton:disabled,
.spectrum-ClearButton.is-disabled {
.spectrum-ClearButton-icon {
color: var( --highcontrast-clear-button-icon-color-disabled, var(--mod-clear-button-icon-color-disabled, var(--spectrum-clear-button-icon-color-disabled)));
}
}

.spectrum-ClearButton-fill {
background-color: var(--mod-clear-button-background-color, var(--spectrum-clear-button-background-color));

Expand All @@ -124,6 +140,8 @@
justify-content: center;
}

/* @deprecated .spectrum-ClearButton--overBackground */
.spectrum-ClearButton--staticWhite,
.spectrum-ClearButton--overBackground {
&:focus-visible {
outline: none;
Expand Down
35 changes: 22 additions & 13 deletions components/clearbutton/metadata/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
{
"sourceFile": "index.css",
"selectors": [
".js-focus-within .spectrum-ClearButton[focus-within]",
".js-focus-within .spectrum-ClearButton[focus-within] .spectrum-ClearButton-fill",
".js-focus-within .spectrum-ClearButton:not(:disabled)[focus-within]",
".js-focus-within .spectrum-ClearButton:not(:disabled)[focus-within] .spectrum-ClearButton-fill",
".spectrum-ClearButton",
".spectrum-ClearButton > .spectrum-Icon",
".spectrum-ClearButton--overBackground:focus-visible",
".spectrum-ClearButton--staticWhite:focus-visible",
".spectrum-ClearButton-fill",
".spectrum-ClearButton.is-disabled",
".spectrum-ClearButton.is-disabled .spectrum-ClearButton-icon",
".spectrum-ClearButton.spectrum-ClearButton--overBackground",
".spectrum-ClearButton.spectrum-ClearButton--quiet",
".spectrum-ClearButton.spectrum-ClearButton--sizeL",
".spectrum-ClearButton.spectrum-ClearButton--sizeS",
".spectrum-ClearButton.spectrum-ClearButton--sizeXL",
".spectrum-ClearButton:active",
".spectrum-ClearButton:active .spectrum-ClearButton-fill",
".spectrum-ClearButton.spectrum-ClearButton--staticWhite",
".spectrum-ClearButton:disabled",
".spectrum-ClearButton:focus-visible",
".spectrum-ClearButton:focus-visible .spectrum-ClearButton-fill",
".spectrum-ClearButton:focus-within",
".spectrum-ClearButton:focus-within .spectrum-ClearButton-fill",
".spectrum-ClearButton:hover",
".spectrum-ClearButton:hover .spectrum-ClearButton-fill",
".spectrum-ClearButton:disabled .spectrum-ClearButton-icon",
".spectrum-ClearButton:not(:disabled)",
".spectrum-ClearButton[focus-within].js-focus-within",
".spectrum-ClearButton[focus-within].js-focus-within .spectrum-ClearButton-fill"
".spectrum-ClearButton:not(:disabled):active",
".spectrum-ClearButton:not(:disabled):active .spectrum-ClearButton-fill",
".spectrum-ClearButton:not(:disabled):focus-visible",
".spectrum-ClearButton:not(:disabled):focus-visible .spectrum-ClearButton-fill",
".spectrum-ClearButton:not(:disabled):focus-within",
".spectrum-ClearButton:not(:disabled):focus-within .spectrum-ClearButton-fill",
".spectrum-ClearButton:not(:disabled):hover",
".spectrum-ClearButton:not(:disabled):hover .spectrum-ClearButton-fill",
".spectrum-ClearButton:not(:disabled)[focus-within].js-focus-within",
".spectrum-ClearButton:not(:disabled)[focus-within].js-focus-within .spectrum-ClearButton-fill"
],
"modifiers": [
"--mod-clear-button-background-color",
Expand All @@ -48,6 +52,7 @@
"--spectrum-clear-button-background-color-key-focus",
"--spectrum-clear-button-height",
"--spectrum-clear-button-icon-color",
"--spectrum-clear-button-icon-color-disabled",
"--spectrum-clear-button-icon-color-down",
"--spectrum-clear-button-icon-color-hover",
"--spectrum-clear-button-icon-color-key-focus",
Expand All @@ -60,6 +65,7 @@
"--spectrum-component-height-300",
"--spectrum-component-height-75",
"--spectrum-disabled-content-color",
"--spectrum-disabled-static-white-content-color",
"--spectrum-gray-200",
"--spectrum-gray-300",
"--spectrum-gray-400",
Expand All @@ -79,5 +85,8 @@
"--system-spectrum-clearbutton-spectrum-clear-button-background-color-key-focus"
],
"passthroughs": [],
"high-contrast": ["--highcontrast-clear-button-icon-color-hover"]
"high-contrast": [
"--highcontrast-clear-button-icon-color-disabled",
"--highcontrast-clear-button-icon-color-hover"
]
}
Loading