Skip to content

Commit

Permalink
chore: combobox foundation upgrade (#5097)
Browse files Browse the repository at this point in the history 
* chore: combobox foundation upgrade

* chore: added yarn lock

* ci: updated golden image cache

---------

Co-authored-by: Rajdeep Chandra <[email protected]>
Co-authored-by: Rajdeep Chandra <[email protected]>
  • Loading branch information
@Rajdeepc
3 people authored Feb 25, 2025
1 parent 851e31b commit 8f11b35
Show file tree
Hide file tree
Showing 9 changed files with 386 additions and 846 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
# 3. Commit this change to the PR branch where the changes exist.
current_golden_images_hash:
type: string
default: a1ca10710680ff347ed0a873d376e4f821a6d493
default: b2ba0ee6dcde27c136be2afb14a68bec20c6d925
wireit_cache_name:
type: string
default: wireit
Expand Down
8 changes: 3 additions & 5 deletions packages/color-wheel/test/color-wheel.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,11 +594,9 @@ describe('ColorWheel', () => {
expect(el.color).to.equal(hsva);
});
it('should flip orientation with dir="rtl"', async () => {
const el = await fixture<ColorWheel>(
html`
<sp-color-wheel></sp-color-wheel>
`
);
const el = await fixture<ColorWheel>(html`
<sp-color-wheel></sp-color-wheel>
`);

await elementUpdated(el);

Expand Down
2 changes: 1 addition & 1 deletion packages/combobox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@spectrum-web-components/textfield": "1.1.2"
},
"devDependencies": {
"@spectrum-css/combobox": "4.0.0-s2-foundations.18"
"@spectrum-css/combobox": "4.0.0-s2-foundations.21"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
222 changes: 2 additions & 220 deletions packages/combobox/src/combobox-overrides.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,225 +27,7 @@ governing permissions and limitations under the License.
--spectrum-combobox-border-color-key-focus: var(
--system-combobox-border-color-key-focus
);
--spectrum-combobox-inline-size: var(--system-combobox-inline-size);
--spectrum-combobox-minimum-width-multiplier: var(
--system-combobox-minimum-width-multiplier
);
--spectrum-combobox-focus-indicator-thickness: var(
--system-combobox-focus-indicator-thickness
);
--spectrum-combobox-focus-indicator-gap: var(
--system-combobox-focus-indicator-gap
);
--spectrum-combobox-focus-indicator-color: var(
--system-combobox-focus-indicator-color
);
--spectrum-combobox-border-radius: var(--system-combobox-border-radius);
--spectrum-combobox-border-width: var(--system-combobox-border-width);
--spectrum-combobox-spacing-label-to-combobox: var(
--system-combobox-spacing-label-to
);
--spectrum-combobox-font-style: var(--system-combobox-font-style);
--spectrum-combobox-line-height: var(--system-combobox-line-height);
--spectrum-combobox-border-color-invalid-default: var(
--system-combobox-border-color-invalid-default
);
--spectrum-combobox-border-color-invalid-hover: var(
--system-combobox-border-color-invalid-hover
);
--spectrum-combobox-border-color-invalid-focus: var(
--system-combobox-border-color-invalid-focus
);
--spectrum-combobox-border-color-invalid-focus-hover: var(
--system-combobox-border-color-invalid-focus-hover
);
--spectrum-combobox-border-color-invalid-key-focus: var(
--system-combobox-border-color-invalid-key-focus
);
--spectrum-combobox-block-size: var(--system-combobox-block-size);
--spectrum-combobox-icon-size: var(--system-combobox-icon-size);
--spectrum-combobox-font-size: var(--system-combobox-font-size);
--spectrum-combobox-spacing-inline-icon-to-button: var(
--system-combobox-spacing-inline-icon-to-button
);
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
--system-combobox-block-spacing-edge-to-progress-circle
);
--spectrum-combobox-block-spacing-edge-to-alert: var(
--system-combobox-block-spacing-edge-to-alert
);
--spectrum-combobox-spacing-edge-to-menu: var(
--system-combobox-spacing-edge-to-menu
);
--spectrum-combobox-spacing-block-start-edge-to-text: var(
--system-combobox-spacing-block-start-edge-to-text
);
--spectrum-combobox-spacing-block-end-edge-to-text: var(
--system-combobox-spacing-block-end-edge-to-text
);
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
--system-combobox-spacing-inline-start-edge-to-text
);
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
--system-combobox-spacing-inline-end-edge-to-text
);
}

:host([size='s']) {
--spectrum-combobox-block-size: var(--system-combobox-size-s-block-size);
--spectrum-combobox-icon-size: var(--system-combobox-size-s-icon-size);
--spectrum-combobox-font-size: var(--system-combobox-size-s-font-size);
--spectrum-combobox-spacing-inline-icon-to-button: var(
--system-combobox-size-s-spacing-inline-icon-to-button
);
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
--system-combobox-size-s-block-spacing-edge-to-progress-circle
);
--spectrum-combobox-block-spacing-edge-to-alert: var(
--system-combobox-size-s-block-spacing-edge-to-alert
);
--spectrum-combobox-spacing-edge-to-menu: var(
--system-combobox-size-s-spacing-edge-to-menu
);
--spectrum-combobox-spacing-block-start-edge-to-text: var(
--system-combobox-size-s-spacing-block-start-edge-to-text
);
--spectrum-combobox-spacing-block-end-edge-to-text: var(
--system-combobox-size-s-spacing-block-end-edge-to-text
);
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
--system-combobox-size-s-spacing-inline-start-edge-to-text
);
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
--system-combobox-size-s-spacing-inline-end-edge-to-text
);
}

:host {
--spectrum-combobox-block-size: var(--system-combobox-size-m-block-size);
--spectrum-combobox-icon-size: var(--system-combobox-size-m-icon-size);
--spectrum-combobox-font-size: var(--system-combobox-size-m-font-size);
--spectrum-combobox-spacing-inline-icon-to-button: var(
--system-combobox-size-m-spacing-inline-icon-to-button
);
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
--system-combobox-size-m-block-spacing-edge-to-progress-circle
);
--spectrum-combobox-block-spacing-edge-to-alert: var(
--system-combobox-size-m-block-spacing-edge-to-alert
);
--spectrum-combobox-spacing-edge-to-menu: var(
--system-combobox-size-m-spacing-edge-to-menu
);
--spectrum-combobox-spacing-block-start-edge-to-text: var(
--system-combobox-size-m-spacing-block-start-edge-to-text
);
--spectrum-combobox-spacing-block-end-edge-to-text: var(
--system-combobox-size-m-spacing-block-end-edge-to-text
);
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
--system-combobox-size-m-spacing-inline-start-edge-to-text
);
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
--system-combobox-size-m-spacing-inline-end-edge-to-text
);
}

:host([size='l']) {
--spectrum-combobox-block-size: var(--system-combobox-size-l-block-size);
--spectrum-combobox-icon-size: var(--system-combobox-size-l-icon-size);
--spectrum-combobox-font-size: var(--system-combobox-size-l-font-size);
--spectrum-combobox-spacing-inline-icon-to-button: var(
--system-combobox-size-l-spacing-inline-icon-to-button
);
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
--system-combobox-size-l-block-spacing-edge-to-progress-circle
);
--spectrum-combobox-block-spacing-edge-to-alert: var(
--system-combobox-size-l-block-spacing-edge-to-alert
);
--spectrum-combobox-spacing-edge-to-menu: var(
--system-combobox-size-l-spacing-edge-to-menu
);
--spectrum-combobox-spacing-block-start-edge-to-text: var(
--system-combobox-size-l-spacing-block-start-edge-to-text
);
--spectrum-combobox-spacing-block-end-edge-to-text: var(
--system-combobox-size-l-spacing-block-end-edge-to-text
);
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
--system-combobox-size-l-spacing-inline-start-edge-to-text
);
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
--system-combobox-size-l-spacing-inline-end-edge-to-text
);
}

:host([size='xl']) {
--spectrum-combobox-block-size: var(--system-combobox-size-xl-block-size);
--spectrum-combobox-icon-size: var(--system-combobox-size-xl-icon-size);
--spectrum-combobox-font-size: var(--system-combobox-size-xl-font-size);
--spectrum-combobox-spacing-inline-icon-to-button: var(
--system-combobox-size-xl-spacing-inline-icon-to-button
);
--spectrum-combobox-block-spacing-edge-to-progress-circle: var(
--system-combobox-size-xl-block-spacing-edge-to-progress-circle
);
--spectrum-combobox-block-spacing-edge-to-alert: var(
--system-combobox-size-xl-block-spacing-edge-to-alert
);
--spectrum-combobox-spacing-edge-to-menu: var(
--system-combobox-size-xl-spacing-edge-to-menu
);
--spectrum-combobox-spacing-block-start-edge-to-text: var(
--system-combobox-size-xl-spacing-block-start-edge-to-text
);
--spectrum-combobox-spacing-block-end-edge-to-text: var(
--system-combobox-size-xl-spacing-block-end-edge-to-text
);
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
--system-combobox-size-xl-spacing-inline-start-edge-to-text
);
--spectrum-combobox-spacing-inline-end-edge-to-text: var(
--system-combobox-size-xl-spacing-inline-end-edge-to-text
);
}

:host([quiet]) {
--spectrum-combobox-minimum-width-multiplier: var(
--system-combobox-quiet-minimum-width-multiplier
);
--spectrum-combobox-spacing-inline-icon-to-button: var(
--system-combobox-quiet-spacing-inline-icon-to-button
);
--spectrum-combobox-spacing-inline-start-edge-to-text: var(
--system-combobox-quiet-spacing-inline-start-edge-to-text
);
--spectrum-combobox-spacing-label-to-combobox: var(
--system-combobox-quiet-spacing-label-to
);
}

:host([quiet][size='s']) {
--spectrum-combobox-spacing-label-to-combobox: var(
--system-combobox-quiet-size-s-spacing-label-to
);
}

:host([quiet]) {
--spectrum-combobox-spacing-label-to-combobox: var(
--system-combobox-quiet-size-m-spacing-label-to
);
}

:host([quiet][size='l']) {
--spectrum-combobox-spacing-label-to-combobox: var(
--system-combobox-quiet-size-l-spacing-label-to
);
}

:host([quiet][size='xl']) {
--spectrum-combobox-spacing-label-to-combobox: var(
--system-combobox-quiet-size-xl-spacing-label-to
--spectrum-combobox-background-color-disabled: var(
--system-combobox-background-color-disabled
);
}
Loading

0 comments on commit 8f11b35

Please sign in to comment.