Skip to content

refactor(slider): use spectrum-tokens #2905

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 2 commits into from
May 19, 2023
Merged

refactor(slider): use spectrum-tokens #2905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5150c9e
feat(slider): use spectrum-tokens
pfulton Feb 6, 2023
1dbc4bb
ci: update golden images cache
Westbrook May 19, 2023
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
parameters:
current_golden_images_hash:
type: string
default: 0eea111a6cbf832e3bce71fba23410df534bef25
default: f01d40f7b72391e43aaa3ca1dc51b556b2ff9a46
wireit_cache_name:
type: string
default: wireit
Expand Down
2 changes: 1 addition & 1 deletion packages/field-label/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@spectrum-web-components/shared": "^0.31.0"
},
"devDependencies": {
"@spectrum-css/fieldlabel": "^5.0.15"
"@spectrum-css/fieldlabel": "^7.0.1"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
43 changes: 29 additions & 14 deletions packages/field-label/src/spectrum-field-label.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ governing permissions and limitations under the License.

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
:host {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-75);
--spectrum-fieldlabel-color: var(
--spectrum-neutral-subdued-content-color-default
);
Expand All @@ -21,15 +22,17 @@ governing permissions and limitations under the License.
--spectrum-field-label-text-to-asterisk: var(
--spectrum-field-label-text-to-asterisk-medium
);
--spectrum-fieldlabel-font-weight: var(--spectrum-regular-font-weight);
--spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-cjk-line-height-100);
}
:host([size='s']) {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-75);
--spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-75);
--spectrum-fieldlabel-bottom-to-text: var(
--spectrum-component-bottom-to-text-75
);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-75);
--spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-line-height-cjk-100);
--spectrum-fieldlabel-side-padding-top: var(
--spectrum-component-top-to-text-75
);
Expand All @@ -42,13 +45,12 @@ governing permissions and limitations under the License.
);
}
:host([size='m']) {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-75);
--spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-75);
--spectrum-fieldlabel-bottom-to-text: var(
--spectrum-component-bottom-to-text-75
);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-75);
--spectrum-fieldlabel-line-height: var(--spectrum-line-height-200);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-line-height-cjk-200);
--spectrum-fieldlabel-side-padding-top: var(
--spectrum-component-top-to-text-75
);
Expand All @@ -61,15 +63,14 @@ governing permissions and limitations under the License.
);
}
:host([size='l']) {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-100);
--spectrum-fieldlabel-top-to-text: var(
--spectrum-component-top-to-text-100
);
--spectrum-fieldlabel-bottom-to-text: var(
--spectrum-component-bottom-to-text-100
);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-100);
--spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-line-height-cjk-100);
--spectrum-fieldlabel-side-padding-top: var(
--spectrum-component-top-to-text-100
);
Expand All @@ -82,15 +83,14 @@ governing permissions and limitations under the License.
);
}
:host([size='xl']) {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-200);
--spectrum-fieldlabel-top-to-text: var(
--spectrum-component-top-to-text-200
);
--spectrum-fieldlabel-bottom-to-text: var(
--spectrum-component-bottom-to-text-200
);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-200);
--spectrum-fieldlabel-line-height: var(--spectrum-line-height-200);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-line-height-cjk-200);
--spectrum-fieldlabel-side-padding-top: var(
--spectrum-component-top-to-text-200
);
Expand All @@ -114,13 +114,17 @@ governing permissions and limitations under the License.
var(--spectrum-fieldlabel-font-size)
);
font-weight: var(
--mod-font-weight-regular,
var(--spectrum-font-weight-regular)
--mod-fieldlabel-font-weight,
var(--spectrum-fieldlabel-font-weight)
);
line-height: var(
--mod-fieldlabel-line-height,
var(--spectrum-fieldlabel-line-height)
);
min-block-size: var(
--mod-fieldlabel-min-height,
var(--spectrum-fieldlabel-min-height)
);
padding-block: var(--spectrum-fieldlabel-top-to-text)
var(--spectrum-fieldlabel-bottom-to-text);
padding-inline: 0;
Expand Down Expand Up @@ -183,13 +187,24 @@ governing permissions and limitations under the License.
}
:host([disabled]) {
color: var(
--mod-disabled-content-color,
var(--spectrum-disabled-content-color)
--highcontrast-disabled-content-color,
var(
--mod-disabled-content-color,
var(--spectrum-disabled-content-color)
)
);
}
:host([disabled]) .required-icon {
color: var(
--mod-disabled-content-color,
var(--spectrum-disabled-content-color)
--highcontrast-disabled-content-color,
var(
--mod-disabled-content-color,
var(--spectrum-disabled-content-color)
)
);
}
@media (forced-colors: active) {
:host {
--highcontrast-disabled-content-color: GrayText;
}
}
2 changes: 1 addition & 1 deletion packages/slider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"@spectrum-web-components/theme": "^0.31.0"
},
"devDependencies": {
"@spectrum-css/slider": "^3.1.25"
"@spectrum-css/slider": "^4.0.1"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
4 changes: 2 additions & 2 deletions packages/slider/src/HandleController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,8 @@ export class HandleController implements Controller {
}%`,
'z-index': zIndex.toString(),
// Allow setting background per-handle
'background-color': `var(--spectrum-slider-handle-background-color-${index}, var(--spectrum-slider-handle-default-background-color))`,
'border-color': `var(--spectrum-slider-handle-border-color-${index}, var(-spectrum-slider-handle-default-border-color))`,
'background-color': `var(--spectrum-slider-handle-background-color-${index}, var(--spectrum-slider-handle-background-color))`,
'border-color': `var(--spectrum-slider-handle-border-color-${index}, var(--spectrum-slider-handle-border-color))`,
};
const ariaLabelledBy = isMultiHandle ? `label input-${index}` : 'label';
return html`
Expand Down
64 changes: 0 additions & 64 deletions packages/slider/src/slider.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@ governing permissions and limitations under the License.

@import './spectrum-slider.css';

:host {
--spectrum-slider-handle-default-background-color: var(
--spectrum-slider-m-handle-background-color,
var(--spectrum-alias-background-color-transparent)
);
--spectrum-slider-handle-default-border-color: var(
--spectrum-slider-m-handle-border-color,
var(--spectrum-global-color-gray-700)
);
}

sp-field-label {
padding-top: 0;
padding-bottom: 0;
Expand Down Expand Up @@ -133,30 +122,6 @@ sp-field-label {
background-size: var(--spectrum-slider-track-background-size) !important;
}

:host([dir='ltr']) .track:before {
background: var(
--spectrum-slider-m-track-color,
var(
--spectrum-slider-track-color,
var(--spectrum-global-color-gray-300)
)
);
}

:host([dir='rtl']) .track:before {
/* .spectrum-Slider-track:before */
background: var(
--spectrum-slider-m-track-color,
var(
--spectrum-slider-track-color-rtl,
var(
--spectrum-slider-track-color,
var(--spectrum-global-color-gray-300)
)
)
);
}

:host([dir='ltr']) .track:last-of-type:before {
background-position: 100%;
}
Expand All @@ -165,17 +130,6 @@ sp-field-label {
background-position: 100%;
}

.track:not(:first-of-type, :last-of-type) {
padding-left: calc(
var(--spectrum-slider-handle-width) / 2 +
var(--spectrum-slider-track-handleoffset)
) !important;
padding-right: calc(
var(--spectrum-slider-handle-width) / 2 +
var(--spectrum-slider-track-handleoffset)
) !important;
}

:host([dir='ltr']) .track:not(:first-of-type, :last-of-type) {
left: var(--spectrum-slider-track-segment-position);
}
Expand Down Expand Up @@ -206,21 +160,3 @@ sp-field-label {
padding: 0;
margin: 0;
}

/**
* Start workaround to fastfoward fixes in https://github.com/adobe/spectrum-web-components/issues/2905
*/

#track {
cursor: pointer;
}

.handle.dragging,
.handle.handle-highlight,
.handle:active {
border-width: var(--spectrum-slider-handle-border-width-down-medium);
}

/**
* End workaround to fastfoward fixes in https://github.com/adobe/spectrum-web-components/issues/2905
*/
Loading