Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/funny-insects-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@spectrum-web-components/radio': patch
'@spectrum-web-components/styles': patch
---

Remove unnecessary system theme references to reduce complexity for components that don't need the additional mapping layer.
86 changes: 0 additions & 86 deletions packages/radio/src/radio-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,91 +15,5 @@
--spectrum-radio-button-border-color-hover: var(--system-radio-button-border-color-hover);
--spectrum-radio-button-border-color-down: var(--system-radio-button-border-color-down);
--spectrum-radio-button-border-color-focus: var(--system-radio-button-border-color-focus);
--spectrum-radio-neutral-content-color: var(--system-radio-neutral-content-color);
--spectrum-radio-neutral-content-color-hover: var(--system-radio-neutral-content-color-hover);
--spectrum-radio-neutral-content-color-down: var(--system-radio-neutral-content-color-down);
--spectrum-radio-neutral-content-color-focus: var(--system-radio-neutral-content-color-focus);
--spectrum-radio-focus-indicator-thickness: var(--system-radio-focus-indicator-thickness);
--spectrum-radio-focus-indicator-gap: var(--system-radio-focus-indicator-gap);
--spectrum-radio-focus-indicator-color: var(--system-radio-focus-indicator-color);
--spectrum-radio-disabled-content-color: var(--system-radio-disabled-content-color);
--spectrum-radio-disabled-border-color: var(--system-radio-disabled-border-color);
--spectrum-radio-emphasized-accent-color: var(--system-radio-emphasized-accent-color);
--spectrum-radio-emphasized-accent-color-hover: var(--system-radio-emphasized-accent-color-hover);
--spectrum-radio-emphasized-accent-color-down: var(--system-radio-emphasized-accent-color-down);
--spectrum-radio-emphasized-accent-color-focus: var(--system-radio-emphasized-accent-color-focus);
--spectrum-radio-border-width: var(--system-radio-border-width);
--spectrum-radio-button-background-color: var(--system-radio-button-background-color);
--spectrum-radio-button-checked-border-color-default: var(--system-radio-button-checked-border-color-default);
--spectrum-radio-button-checked-border-color-hover: var(--system-radio-button-checked-border-color-hover);
--spectrum-radio-button-checked-border-color-down: var(--system-radio-button-checked-border-color-down);
--spectrum-radio-button-checked-border-color-focus: var(--system-radio-button-checked-border-color-focus);
--spectrum-radio-line-height: var(--system-radio-line-height);
--spectrum-radio-animation-duration: var(--system-radio-animation-duration);
--spectrum-radio-height: var(--system-radio-height);
--spectrum-radio-button-control-size: var(--system-radio-button-control-size);
--spectrum-radio-text-to-control: var(--system-radio-text-to-control);
--spectrum-radio-label-top-to-text: var(--system-radio-label-top-to-text);
--spectrum-radio-label-bottom-to-text: var(--system-radio-label-bottom-to-text);
--spectrum-radio-button-top-to-control: var(--system-radio-button-top-to-control);
--spectrum-radio-font-size: var(--system-radio-font-size);
}

:host(:lang(ja)) {
--spectrum-radio-line-height-cjk: var(--system-radio-lang-ja-line-height-cjk);
}

:host(:lang(zh)) {
--spectrum-radio-line-height-cjk: var(--system-radio-lang-zh-line-height-cjk);
}

:host(:lang(ko)) {
--spectrum-radio-line-height-cjk: var(--system-radio-lang-ko-line-height-cjk);
}

:host {
--spectrum-radio-height: var(--system-radio-size-m-height);
--spectrum-radio-button-control-size: var(--system-radio-size-m-button-control-size);
--spectrum-radio-text-to-control: var(--system-radio-size-m-text-to-control);
--spectrum-radio-label-top-to-text: var(--system-radio-size-m-label-top-to-text);
--spectrum-radio-label-bottom-to-text: var(--system-radio-size-m-label-bottom-to-text);
--spectrum-radio-button-top-to-control: var(--system-radio-size-m-button-top-to-control);
--spectrum-radio-font-size: var(--system-radio-size-m-font-size);
}

:host([size="s"]) {
--spectrum-radio-height: var(--system-radio-size-s-height);
--spectrum-radio-button-control-size: var(--system-radio-size-s-button-control-size);
--spectrum-radio-text-to-control: var(--system-radio-size-s-text-to-control);
--spectrum-radio-label-top-to-text: var(--system-radio-size-s-label-top-to-text);
--spectrum-radio-label-bottom-to-text: var(--system-radio-size-s-label-bottom-to-text);
--spectrum-radio-button-top-to-control: var(--system-radio-size-s-button-top-to-control);
--spectrum-radio-font-size: var(--system-radio-size-s-font-size);
}

:host([size="l"]) {
--spectrum-radio-height: var(--system-radio-size-l-height);
--spectrum-radio-button-control-size: var(--system-radio-size-l-button-control-size);
--spectrum-radio-text-to-control: var(--system-radio-size-l-text-to-control);
--spectrum-radio-label-top-to-text: var(--system-radio-size-l-label-top-to-text);
--spectrum-radio-label-bottom-to-text: var(--system-radio-size-l-label-bottom-to-text);
--spectrum-radio-button-top-to-control: var(--system-radio-size-l-button-top-to-control);
--spectrum-radio-font-size: var(--system-radio-size-l-font-size);
}

:host([size="xl"]) {
--spectrum-radio-height: var(--system-radio-size-xl-height);
--spectrum-radio-button-control-size: var(--system-radio-size-xl-button-control-size);
--spectrum-radio-text-to-control: var(--system-radio-size-xl-text-to-control);
--spectrum-radio-label-top-to-text: var(--system-radio-size-xl-label-top-to-text);
--spectrum-radio-label-bottom-to-text: var(--system-radio-size-xl-label-bottom-to-text);
--spectrum-radio-button-top-to-control: var(--system-radio-size-xl-button-top-to-control);
--spectrum-radio-font-size: var(--system-radio-size-xl-font-size);
}

:host([emphasized]) {
--spectrum-radio-button-checked-border-color-default: var(--system-radio-emphasized-button-checked-border-color-default);
--spectrum-radio-button-checked-border-color-hover: var(--system-radio-emphasized-button-checked-border-color-hover);
--spectrum-radio-button-checked-border-color-down: var(--system-radio-emphasized-button-checked-border-color-down);
--spectrum-radio-button-checked-border-color-focus: var(--system-radio-emphasized-button-checked-border-color-focus);
}
17 changes: 9 additions & 8 deletions packages/radio/src/radio.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
}

/**
* Work around for https://github.com/adobe/spectrum-css/issues/2251
**/
:host([dir="rtl"]) #button:after {
transform: translateX(50%) translateY(-50%);
* @todo updated designs call for the radio button to be visible;
* however as that can cause layout shifts, hold this update until a breaking release.
*/
:host([readonly]) #button {
clip: rect(1px, 1px, 1px, 1px);
clip-path: inset(50%);
position: fixed;
inset-block-end: 100%;
inset-inline-end: 100%;
}

/**
* End workaround
**/
79 changes: 69 additions & 10 deletions packages/radio/src/spectrum-radio.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,75 @@
* governing permissions and limitations under the License.
*/

:host {
--spectrum-radio-neutral-content-color: var(--spectrum-neutral-content-color-default);
--spectrum-radio-neutral-content-color-hover: var(--spectrum-neutral-content-color-hover);
--spectrum-radio-neutral-content-color-down: var(--spectrum-neutral-content-color-down);
--spectrum-radio-neutral-content-color-focus: var(--spectrum-neutral-content-color-key-focus);
--spectrum-radio-focus-indicator-thickness: var(--spectrum-focus-indicator-thickness);
--spectrum-radio-focus-indicator-gap: var(--spectrum-focus-indicator-gap);
--spectrum-radio-focus-indicator-color: var(--spectrum-focus-indicator-color);
--spectrum-radio-disabled-content-color: var(--spectrum-disabled-content-color);
--spectrum-radio-disabled-border-color: var(--spectrum-disabled-content-color);
--spectrum-radio-emphasized-accent-color: var(--spectrum-accent-color-900);
--spectrum-radio-emphasized-accent-color-hover: var(--spectrum-accent-color-1000);
--spectrum-radio-emphasized-accent-color-down: var(--spectrum-accent-color-1100);
--spectrum-radio-emphasized-accent-color-focus: var(--spectrum-accent-color-1000);
--spectrum-radio-border-width: var(--spectrum-border-width-200);
--spectrum-radio-button-checked-border-color-default: var(--spectrum-neutral-background-color-selected-default);
--spectrum-radio-button-checked-border-color-hover: var(--spectrum-neutral-background-color-selected-hover);
--spectrum-radio-button-checked-border-color-down: var(--spectrum-neutral-background-color-selected-down);
--spectrum-radio-button-checked-border-color-focus: var(--spectrum-neutral-background-color-selected-key-focus);
--spectrum-radio-line-height: var(--spectrum-line-height-100);
--spectrum-radio-animation-duration: var(--spectrum-animation-duration-100);
--spectrum-radio-height: var(--spectrum-component-height-100);
--spectrum-radio-button-control-size: var(--spectrum-radio-button-control-size-medium);
--spectrum-radio-text-to-control: var(--spectrum-text-to-control-100);
--spectrum-radio-label-top-to-text: var(--spectrum-component-top-to-text-100);
--spectrum-radio-label-bottom-to-text: var(--spectrum-component-bottom-to-text-100);
--spectrum-radio-button-top-to-control: var(--spectrum-radio-button-top-to-control-medium);
--spectrum-radio-font-size: var(--spectrum-font-size-100);
}

:host(:lang(ja)),
:host(:lang(ko)),
:host(:lang(zh)) {
--spectrum-radio-line-height-cjk: var(--spectrum-cjk-line-height-100);
}

:host([size="s"]) {
--spectrum-radio-height: var(--spectrum-component-height-75);
--spectrum-radio-button-control-size: var(--spectrum-radio-button-control-size-small);
--spectrum-radio-text-to-control: var(--spectrum-text-to-control-75);
--spectrum-radio-label-top-to-text: var(--spectrum-component-top-to-text-75);
--spectrum-radio-label-bottom-to-text: var(--spectrum-component-bottom-to-text-75);
--spectrum-radio-button-top-to-control: var(--spectrum-radio-button-top-to-control-small);
--spectrum-radio-font-size: var(--spectrum-font-size-75);
}

:host([size="l"]) {
--spectrum-radio-height: var(--spectrum-component-height-200);
--spectrum-radio-button-control-size: var(--spectrum-radio-button-control-size-large);
--spectrum-radio-text-to-control: var(--spectrum-text-to-control-200);
--spectrum-radio-label-top-to-text: var(--spectrum-component-top-to-text-200);
--spectrum-radio-label-bottom-to-text: var(--spectrum-component-bottom-to-text-200);
--spectrum-radio-button-top-to-control: var(--spectrum-radio-button-top-to-control-large);
--spectrum-radio-font-size: var(--spectrum-font-size-200);
}

:host([size="xl"]) {
--spectrum-radio-height: var(--spectrum-component-height-300);
--spectrum-radio-button-control-size: var(--spectrum-radio-button-control-size-extra-large);
--spectrum-radio-text-to-control: var(--spectrum-text-to-control-300);
--spectrum-radio-label-top-to-text: var(--spectrum-component-top-to-text-300);
--spectrum-radio-label-bottom-to-text: var(--spectrum-component-bottom-to-text-300);
--spectrum-radio-button-top-to-control: var(--spectrum-radio-button-top-to-control-extra-large);
--spectrum-radio-font-size: var(--spectrum-font-size-300);
}

@media (forced-colors: active) {
:host {
--highcontrast-radio-button-background-color: ButtonFace;
--highcontrast-radio-neutral-content-color: CanvasText;
--highcontrast-radio-neutral-content-color-hover: CanvasText;
--highcontrast-radio-neutral-content-color-down: CanvasText;
Expand Down Expand Up @@ -79,16 +146,8 @@
color: var(--highcontrast-radio-neutral-content-color-focus, var(--mod-radio-neutral-content-color-focus, var(--spectrum-radio-neutral-content-color-focus)));
}

:host([readonly]) #input:read-only {
cursor: auto;
}

:host([readonly]) #button {
clip: rect(1px, 1px, 1px, 1px);
clip-path: inset(50%);
position: fixed;
inset-block-end: 100%;
inset-inline-end: 100%;
:host([readonly]) #input {
pointer-events: none;
}

:host([readonly][checked][disabled]) #input ~ #label,
Expand Down
8 changes: 0 additions & 8 deletions tools/styles/express/spectrum-core-global.css
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,6 @@
--spectrum-alias-han-detail-text-font-weight: var(--spectrum-global-font-weight-regular);
--spectrum-alias-han-detail-text-font-weight-emphasis: var(--spectrum-global-font-weight-bold);
--spectrum-alias-han-detail-text-font-weight-strong: var(--spectrum-global-font-weight-black);
}

:root,
:host {
--spectrum-alias-item-height-s: var(--spectrum-global-dimension-size-300);
--spectrum-alias-item-height-m: var(--spectrum-global-dimension-size-400);
--spectrum-alias-item-height-l: var(--spectrum-global-dimension-size-500);
Expand Down Expand Up @@ -856,10 +852,6 @@
--spectrum-alias-tag-icon-margin-right-l: var(--spectrum-global-dimension-size-115);
--spectrum-alias-tag-focusring-size: var(--spectrum-global-dimension-size-25);
--spectrum-alias-tag-focusring-gap-selected: var(--spectrum-global-dimension-size-25);
}

:root,
:host {
--spectrum-alias-colorhandle-outer-border-color: #0000006b;
--spectrum-alias-component-text-color-selected-default: var(--spectrum-global-color-gray-50);
--spectrum-alias-component-text-color-selected-hover: var(--spectrum-alias-component-text-color-selected-default);
Expand Down
8 changes: 0 additions & 8 deletions tools/styles/spectrum-core-global.css
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,6 @@
--spectrum-alias-han-detail-text-font-weight: var(--spectrum-global-font-weight-regular);
--spectrum-alias-han-detail-text-font-weight-emphasis: var(--spectrum-global-font-weight-bold);
--spectrum-alias-han-detail-text-font-weight-strong: var(--spectrum-global-font-weight-black);
}

:root,
:host {
--spectrum-alias-item-height-s: var(--spectrum-global-dimension-size-300);
--spectrum-alias-item-height-m: var(--spectrum-global-dimension-size-400);
--spectrum-alias-item-height-l: var(--spectrum-global-dimension-size-500);
Expand Down Expand Up @@ -853,10 +849,6 @@
--spectrum-alias-tag-focusring-gap-selected: var(--spectrum-global-dimension-size-25);
--spectrum-alias-colorloupe-width: var(--spectrum-global-dimension-static-size-600);
--spectrum-alias-colorloupe-height: var(--spectrum-global-dimension-static-size-800);
}

:root,
:host {
--spectrum-alias-colorhandle-outer-border-color: #0000006b;
--spectrum-alias-transparent-blue-background-color-hover: #0057be26;
--spectrum-alias-transparent-blue-background-color-down: #0048994d;
Expand Down
8 changes: 0 additions & 8 deletions tools/styles/spectrum-two/spectrum-core-global.css
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,6 @@
--spectrum-alias-han-detail-text-font-weight: var(--spectrum-global-font-weight-regular);
--spectrum-alias-han-detail-text-font-weight-emphasis: var(--spectrum-global-font-weight-bold);
--spectrum-alias-han-detail-text-font-weight-strong: var(--spectrum-global-font-weight-black);
}

:root,
:host {
--spectrum-alias-item-height-s: var(--spectrum-global-dimension-size-300);
--spectrum-alias-item-height-m: var(--spectrum-global-dimension-size-400);
--spectrum-alias-item-height-l: var(--spectrum-global-dimension-size-500);
Expand Down Expand Up @@ -853,10 +849,6 @@
--spectrum-alias-tag-focusring-gap-selected: var(--spectrum-global-dimension-size-25);
--spectrum-alias-colorloupe-width: var(--spectrum-global-dimension-static-size-600);
--spectrum-alias-colorloupe-height: var(--spectrum-global-dimension-static-size-800);
}

:root,
:host {
--spectrum-alias-colorhandle-outer-border-color: #0000006b;
--spectrum-alias-transparent-blue-background-color-hover: #0057be26;
--spectrum-alias-transparent-blue-background-color-down: #0048994d;
Expand Down
Loading
Loading