Skip to content

fix(search): update disabled state in spectrum two #3593

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 3 commits into from
Mar 12, 2025
Merged

fix(search): update disabled state in spectrum two #3593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a043b69
fix(search): update disabled state in spectrum two
TarunAdobe Mar 3, 2025
312a7f0
Update .changeset/four-phones-agree.md
rise-erpelding Mar 11, 2025
6ed8ac6
Update changeset
rise-erpelding Mar 12, 2025
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
7 changes: 7 additions & 0 deletions .changeset/four-phones-agree.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@spectrum-css/search": patch
---

Updated `--spectrum-search-background-color-disabled` to `--spectrum-gray-25` and `--spectrum-search-border-color-disabled` to `--spectrum-gray-300` for the S2 foundations contexts.

Also defines disabled quiet border and background colors (`--system-search-quiet-background-color-disabled` and `--system-search-quiet-border-color-disabled`) in order to maintain disabled quiet styling.
6 changes: 5 additions & 1 deletion components/search/dist/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
"--spectrum-component-top-to-text-100",
"--spectrum-corner-radius-100",
"--spectrum-default-font-style",
"--spectrum-disabled-background-color",
"--spectrum-disabled-border-color",
"--spectrum-disabled-content-color",
"--spectrum-field-edge-to-visual-quiet",
Expand All @@ -127,6 +126,7 @@
"--spectrum-focus-indicator-gap",
"--spectrum-focus-indicator-thickness",
"--spectrum-gray-25",
"--spectrum-gray-300",
"--spectrum-gray-500",
"--spectrum-gray-600",
"--spectrum-gray-800",
Expand All @@ -151,13 +151,17 @@
],
"system-theme": [
"--system-search-background-color",
"--system-search-background-color-disabled",
"--system-search-border-color-default",
"--system-search-border-color-disabled",
"--system-search-border-color-focus",
"--system-search-border-color-focus-hover",
"--system-search-border-color-hover",
"--system-search-border-color-key-focus",
"--system-search-border-radius",
"--system-search-edge-to-visual",
"--system-search-quiet-background-color-disabled",
"--system-search-quiet-border-color-disabled",
"--system-search-size-l-border-radius",
"--system-search-size-l-edge-to-visual",
"--system-search-size-m-border-radius",
Expand Down
2 changes: 0 additions & 2 deletions components/search/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@

/* Disabled */
--spectrum-search-color-disabled: var(--spectrum-disabled-content-color);
--spectrum-search-background-color-disabled: var(--spectrum-disabled-background-color);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love that you removed these as well as putting them into the theme files so that we don't have conflicting sources for the variables! Great attention to detail.

--spectrum-search-border-color-disabled: var(--spectrum-disabled-background-color);

/* @passthrough start -- settings for nested Textfield component */
--mod-textfield-font-family: var(--mod-search-font-family, var(--spectrum-search-font-family));
Expand Down
7 changes: 7 additions & 0 deletions components/search/themes/spectrum-two.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
--spectrum-search-border-color-key-focus: var(--spectrum-gray-900);

--spectrum-search-background-color: var(--spectrum-gray-25);
--spectrum-search-background-color-disabled: var(--spectrum-gray-25);
--spectrum-search-border-color-disabled: var(--spectrum-gray-300);

&,
&.spectrum-Search--sizeM {
Expand All @@ -42,4 +44,9 @@
--spectrum-search-edge-to-visual: var(--spectrum-component-edge-to-visual-300);
}
}

.spectrum-Search--quiet {
--spectrum-search-background-color-disabled: transparent;
--spectrum-search-border-color-disabled: var(--spectrum-disabled-border-color);
}
}
2 changes: 2 additions & 0 deletions components/search/themes/spectrum.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

@container style(--system: legacy) {
.spectrum-Search {
--spectrum-search-background-color-disabled: var(--spectrum-disabled-background-color);
--spectrum-search-border-color-disabled: var(--spectrum-disabled-background-color);
--spectrum-search-background-color: var(--spectrum-gray-50);
}
}
Loading