Skip to content

feat(combobox): adding new s2 migration #3683

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

Open
wants to merge 12 commits into
base: spectrum-two
Choose a base branch
from
Open

feat(combobox): adding new s2 migration #3683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ff02395
feat(combobox): adding new s2 migration
aramos-adobe Apr 23, 2025
2949dc4
Merge branch 'spectrum-two' into aramos-adobe/css769-combox-s2-migration
aramos-adobe Apr 29, 2025
d541906
Merge branch 'spectrum-two' into aramos-adobe/css769-combox-s2-migration
aramos-adobe Apr 29, 2025
75ce502
feat(combobox): refactoring field label and helptext
aramos-adobe Apr 30, 2025
428d391
feat(combobox): add metadata files
aramos-adobe Apr 30, 2025
93117b2
Merge branch 'spectrum-two' into aramos-adobe/css769-combox-s2-migration
aramos-adobe May 1, 2025
fb54e14
Merge branch 'spectrum-two' into aramos-adobe/css769-combox-s2-migration
aramos-adobe May 1, 2025
15fa122
Merge branch 'spectrum-two' into aramos-adobe/css769-combox-s2-migration
aramos-adobe May 5, 2025
2488a03
Merge branch 'spectrum-two' into aramos-adobe/css769-combox-s2-migration
aramos-adobe May 6, 2025
acd4c20
feat(combobox): add changeset, more test cases and metadata
aramos-adobe May 6, 2025
5c273ba
chore(combobox): add new s2 branch changes
aramos-adobe May 6, 2025
055803f
chore(combobox): adding helptext metadata
aramos-adobe May 6, 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
22 changes: 22 additions & 0 deletions .changeset/four-lemons-warn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
"@spectrum-css/combobox": major
---

## Combobox S2 Migration

The new combo box is coming in with more pronounced corner radius, thicker outline, and the use of the infield button nested inside. The quiet styling has also been deprecated.

### New tokens

`--spectrum-combobox-font-weight`
`--spectrum-combobox-line-height-cjk`
`--spectrum-combobox-spacing-alert-icon-to-text`
`--spectrum-combobox-spacing-to-help-text`

### New mods

`--mod-combobox-line-height-cjk`
`--mod-combobox-popover-animation-distance`
`--mod-combobox-spacing-alert-icon-to-text`
`--mod-combobox-spacing-to-help-text`
`--mod-combobox-textfield-background-color`
107 changes: 58 additions & 49 deletions components/combobox/dist/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,17 @@
".spectrum-Combobox",
".spectrum-Combobox .spectrum-Combobox-button.spectrum-PickerButton--quiet .spectrum-PickerButton-fill",
".spectrum-Combobox .spectrum-Combobox-button.spectrum-PickerButton--quiet .spectrum-PickerButton-icon",
".spectrum-Combobox .spectrum-Popover.is-open",
".spectrum-Combobox--quiet",
".spectrum-Combobox--quiet .spectrum-Combobox-input",
".spectrum-Combobox--quiet .spectrum-Combobox-textfield.is-invalid .spectrum-Combobox-input",
".spectrum-Combobox--quiet .spectrum-Combobox-textfield.is-invalid .spectrum-Textfield-validationIcon",
".spectrum-Combobox--quiet .spectrum-Combobox-textfield.is-loading .spectrum-Combobox-input",
".spectrum-Combobox--quiet .spectrum-Combobox-textfield.is-readOnly .spectrum-Combobox-input:read-only",
".spectrum-Combobox--quiet .spectrum-Combobox-textfield.is-readOnly.is-disabled .spectrum-Combobox-input:read-only",
".spectrum-Combobox--quiet .spectrum-Combobox-textfield.is-readOnly.is-invalid > .spectrum-Combobox-input:read-only",
".spectrum-Combobox--quiet.spectrum-Combobox--sizeL",
".spectrum-Combobox--quiet.spectrum-Combobox--sizeM",
".spectrum-Combobox--quiet.spectrum-Combobox--sizeS",
".spectrum-Combobox--quiet.spectrum-Combobox--sizeXL",
".spectrum-Combobox ~ .spectrum-Popover.is-open",
".spectrum-Combobox--sideLabel .spectrum-Combobox-content",
".spectrum-Combobox--sideLabel .spectrum-Combobox-helptext",
".spectrum-Combobox--sideLabel .spectrum-Combobox-label",
".spectrum-Combobox--sideLabel .spectrum-Combobox-textfield",
".spectrum-Combobox--sizeL",
".spectrum-Combobox--sizeL ~ .spectrum-Combobox-popover",
".spectrum-Combobox--sizeS",
".spectrum-Combobox--sizeS ~ .spectrum-Combobox-popover",
".spectrum-Combobox--sizeXL",
".spectrum-Combobox--sizeXL ~ .spectrum-Combobox-popover",
".spectrum-Combobox-button",
".spectrum-Combobox-button.is-focused:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet)",
".spectrum-Combobox-button.is-focused:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet):hover",
Expand All @@ -39,15 +34,20 @@
".spectrum-Combobox-button:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet):focus-visible",
".spectrum-Combobox-button:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet):focus:hover",
".spectrum-Combobox-button:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet):hover",
".spectrum-Combobox-content",
".spectrum-Combobox-helptext",
".spectrum-Combobox-helptext .spectrum-HelpText-text",
".spectrum-Combobox-input",
".spectrum-Combobox-input::placeholder",
".spectrum-Combobox-input:active",
".spectrum-Combobox-input:focus",
".spectrum-Combobox-input:focus:hover",
".spectrum-Combobox-input:hover",
".spectrum-Combobox-input:lang(ja)",
".spectrum-Combobox-input:lang(ko)",
".spectrum-Combobox-input:lang(zh)",
".spectrum-Combobox-progress-circle",
".spectrum-Combobox-progress-circle:dir(rtl)",
".spectrum-Combobox-textfield",
".spectrum-Combobox-textfield.is-focused .spectrum-Combobox-input",
".spectrum-Combobox-textfield.is-focused .spectrum-Combobox-input:hover",
".spectrum-Combobox-textfield.is-invalid .spectrum-Combobox-input",
Expand All @@ -61,12 +61,12 @@
".spectrum-Combobox.is-focused:hover .spectrum-Combobox-button:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet)",
".spectrum-Combobox.is-keyboardFocused .spectrum-Combobox-button.is-invalid:not(:disabled, .spectrum-PickerButton--quiet)",
".spectrum-Combobox.is-keyboardFocused .spectrum-Combobox-button:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet)",
".spectrum-Combobox.is-readOnly.is-disabled:not(.spectrum-Combobox--quiet) .spectrum-Combobox-input:read-only",
".spectrum-Combobox.is-readOnly.is-disabled:not(.spectrum-Combobox--quiet) .spectrum-Combobox-input:read-only:hover",
".spectrum-Combobox.is-readOnly.is-invalid:not(.spectrum-Combobox--quiet) .spectrum-Combobox-input:read-only",
".spectrum-Combobox.is-readOnly:not(.spectrum-Combobox--quiet) .spectrum-Combobox-input:read-only",
".spectrum-Combobox.is-readOnly:not(.spectrum-Combobox--quiet) .spectrum-Combobox-input:read-only:hover",
".spectrum-Combobox.is-readOnly:not(.spectrum-Combobox--quiet) .spectrum-Combobox-textfield.is-keyboardFocused .spectrum-Combobox-input",
".spectrum-Combobox.is-readOnly .spectrum-Combobox-input:read-only",
".spectrum-Combobox.is-readOnly .spectrum-Combobox-input:read-only:hover",
".spectrum-Combobox.is-readOnly .spectrum-Combobox-textfield.is-keyboardFocused .spectrum-Combobox-input",
".spectrum-Combobox.is-readOnly.is-disabled .spectrum-Combobox-input:read-only",
".spectrum-Combobox.is-readOnly.is-disabled .spectrum-Combobox-input:read-only:hover",
".spectrum-Combobox.is-readOnly.is-invalid .spectrum-Combobox-input:read-only",
".spectrum-Combobox:has(:active) .spectrum-Combobox-button.is-invalid:not(:disabled, .spectrum-PickerButton--quiet)",
".spectrum-Combobox:has(:active) .spectrum-Combobox-button:not(:disabled, .is-invalid, .spectrum-PickerButton--quiet)",
".spectrum-Combobox:has(:focus) .spectrum-Combobox-button.is-invalid:not(:disabled, .spectrum-PickerButton--quiet)",
Expand Down Expand Up @@ -123,25 +123,24 @@
"--mod-combobox-icon-size",
"--mod-combobox-inline-size",
"--mod-combobox-line-height",
"--mod-combobox-line-height-cjk",
"--mod-combobox-min-inline-size",
"--mod-combobox-popover-animation-distance",
"--mod-combobox-readonly-border-color-disabled",
"--mod-combobox-readonly-input-border-color",
"--mod-combobox-spacing-alert-icon-to-text",
"--mod-combobox-spacing-block-end-edge-to-text",
"--mod-combobox-spacing-block-start-edge-to-text",
"--mod-combobox-spacing-edge-to-menu",
"--mod-combobox-spacing-inline-end-edge-to-text",
"--mod-combobox-spacing-inline-icon-to-button",
"--mod-combobox-spacing-inline-start-edge-to-text",
"--mod-combobox-spacing-label-to-combobox"
"--mod-combobox-spacing-label-to-combobox",
"--mod-combobox-spacing-to-help-text",
"--mod-combobox-textfield-background-color"
],
"component": [
"--spectrum-combo-box-minimum-width-multiplier",
"--spectrum-combo-box-quiet-minimum-width-multiplier",
"--spectrum-combo-box-visual-to-field-button-extra-large",
"--spectrum-combo-box-visual-to-field-button-large",
"--spectrum-combo-box-visual-to-field-button-medium",
"--spectrum-combo-box-visual-to-field-button-quiet",
"--spectrum-combo-box-visual-to-field-button-small",
"--spectrum-combo-box-visual-to-field-button",
"--spectrum-combobox-background-color-default",
"--spectrum-combobox-background-color-disabled",
"--spectrum-combobox-block-size",
"--spectrum-combobox-block-spacing-edge-to-alert",
Expand All @@ -159,33 +158,36 @@
"--spectrum-combobox-border-color-key-focus",
"--spectrum-combobox-border-radius",
"--spectrum-combobox-border-width",
"--spectrum-combobox-button-inline-offset",
"--spectrum-combobox-button-width",
"--spectrum-combobox-focus-indicator-color",
"--spectrum-combobox-focus-indicator-gap",
"--spectrum-combobox-focus-indicator-thickness",
"--spectrum-combobox-font-size",
"--spectrum-combobox-font-style",
"--spectrum-combobox-font-weight",
"--spectrum-combobox-icon-size",
"--spectrum-combobox-inline-size",
"--spectrum-combobox-line-height",
"--spectrum-combobox-line-height-cjk",
"--spectrum-combobox-min-inline-size",
"--spectrum-combobox-readonly-background-color-disabled",
"--spectrum-combobox-readonly-border-color-disabled",
"--spectrum-combobox-readonly-border-color-invalid-default",
"--spectrum-combobox-readonly-input-background-color",
"--spectrum-combobox-readonly-input-border-color",
"--spectrum-combobox-readonly-text-color-disabled",
"--spectrum-combobox-spacing-alert-icon-to-text",
"--spectrum-combobox-spacing-block-end-edge-to-text",
"--spectrum-combobox-spacing-block-start-edge-to-text",
"--spectrum-combobox-spacing-edge-to-menu",
"--spectrum-combobox-spacing-inline-end-edge-to-text",
"--spectrum-combobox-spacing-inline-icon-to-button",
"--spectrum-combobox-spacing-inline-start-edge-to-text",
"--spectrum-combobox-spacing-label-to-combobox"
"--spectrum-combobox-spacing-label-to-combobox",
"--spectrum-combobox-spacing-to-help-text"
],
"global": [
"--spectrum-border-width-100",
"--spectrum-border-width-200",
"--spectrum-cjk-line-height-100",
"--spectrum-component-bottom-to-text-100",
"--spectrum-component-bottom-to-text-200",
"--spectrum-component-bottom-to-text-300",
Expand All @@ -206,26 +208,27 @@
"--spectrum-component-top-to-text-200",
"--spectrum-component-top-to-text-300",
"--spectrum-component-top-to-text-75",
"--spectrum-corner-radius-100",
"--spectrum-component-top-to-workflow-icon-100",
"--spectrum-component-top-to-workflow-icon-200",
"--spectrum-component-top-to-workflow-icon-300",
"--spectrum-component-top-to-workflow-icon-75",
"--spectrum-corner-radius-medium-size-extra-large",
"--spectrum-corner-radius-medium-size-large",
"--spectrum-corner-radius-medium-size-medium",
"--spectrum-corner-radius-medium-size-small",
"--spectrum-default-font-style",
"--spectrum-disabled-background-color",
"--spectrum-disabled-border-color",
"--spectrum-disabled-content-color",
"--spectrum-field-edge-to-text-quiet",
"--spectrum-field-label-to-component",
"--spectrum-field-label-to-component-quiet-extra-large",
"--spectrum-field-label-to-component-quiet-large",
"--spectrum-field-label-to-component-quiet-medium",
"--spectrum-field-label-to-component-quiet-small",
"--spectrum-field-top-to-alert-icon-extra-large",
"--spectrum-field-top-to-alert-icon-large",
"--spectrum-field-top-to-alert-icon-medium",
"--spectrum-field-top-to-alert-icon-small",
"--spectrum-field-top-to-progress-circle-extra-large",
"--spectrum-field-top-to-progress-circle-large",
"--spectrum-field-top-to-progress-circle-medium",
"--spectrum-field-top-to-progress-circle-small",
"--spectrum-field-width",
"--spectrum-field-width-extra-large",
"--spectrum-field-width-large",
"--spectrum-field-width-medium",
"--spectrum-field-width-small",
"--spectrum-focus-indicator-color",
"--spectrum-focus-indicator-gap",
"--spectrum-focus-indicator-thickness",
Expand All @@ -234,17 +237,22 @@
"--spectrum-font-size-300",
"--spectrum-font-size-75",
"--spectrum-gray-25",
"--spectrum-gray-50",
"--spectrum-gray-500",
"--spectrum-gray-600",
"--spectrum-gray-300",
"--spectrum-gray-400",
"--spectrum-gray-800",
"--spectrum-gray-900",
"--spectrum-help-text-to-component",
"--spectrum-line-height-100",
"--spectrum-negative-border-color-default",
"--spectrum-negative-border-color-focus",
"--spectrum-negative-border-color-focus-hover",
"--spectrum-negative-border-color-hover",
"--spectrum-negative-border-color-key-focus",
"--spectrum-regular-font-weight",
"--spectrum-text-to-visual-100",
"--spectrum-text-to-visual-200",
"--spectrum-text-to-visual-300",
"--spectrum-text-to-visual-75",
"--spectrum-workflow-icon-size-100",
"--spectrum-workflow-icon-size-200",
"--spectrum-workflow-icon-size-300",
Expand All @@ -253,12 +261,11 @@
"passthroughs": [
"--mod-picker-button-background-color",
"--mod-picker-button-background-color-disabled",
"--mod-picker-button-background-color-quiet",
"--mod-picker-button-border-color",
"--mod-picker-button-border-color-disabled",
"--mod-picker-button-border-color-quiet",
"--mod-picker-button-border-width",
"--mod-picker-button-font-color-disabled",
"--mod-popover-animation-distance",
"--mod-textfield-background-color",
"--mod-textfield-background-color-disabled",
"--mod-textfield-border-color",
Expand Down Expand Up @@ -287,8 +294,10 @@
"--mod-textfield-text-color-keyboard-focus"
],
"high-contrast": [
"--highcontrast-combobox-background-color-default",
"--highcontrast-combobox-border-color-highlight",
"--highcontrast-combobox-border-color-invalid",
"--highcontrast-combobox-readonly-border-color",
"--highcontrast-textfield-border-color-invalid-default",
"--highcontrast-textfield-text-color-disabled"
]
Expand Down
Loading
Loading