Skip to content
Merged
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
4 changes: 3 additions & 1 deletion .changeset/stale-candies-camp.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
'@spectrum-web-components/tooltip': patch
'@spectrum-web-components/styles': patch
'@spectrum-web-components/tabs': patch
'@spectrum-web-components/toast': patch
'@spectrum-web-components/tooltip': patch
---

Remove unnecessary system theme references to reduce complexity for components that don't need the additional mapping layer.
2 changes: 1 addition & 1 deletion packages/tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"@spectrum-web-components/shared": "1.5.0"
},
"devDependencies": {
"@spectrum-css/tabs": "6.0.0-s2-foundations.16"
"@spectrum-css/tabs": "6.1.1"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
66 changes: 54 additions & 12 deletions packages/tabs/src/spectrum-tabs-sizes.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,65 @@ governing permissions and limitations under the License.
*/

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
:host([size='s']) #list {
--spectrum-tabs-item-height: var(--spectrum-tab-item-height-small);
--spectrum-tabs-item-horizontal-spacing: var(--spectrum-tab-item-to-tab-item-horizontal-small);
--spectrum-tabs-item-vertical-spacing: var(--spectrum-tab-item-to-tab-item-vertical-small);
--spectrum-tabs-start-to-edge: var(--spectrum-tab-item-start-to-edge-small);
--spectrum-tabs-top-to-text: var(--spectrum-tab-item-top-to-text-small);
--spectrum-tabs-bottom-to-text: var(--spectrum-tab-item-bottom-to-text-small);
--spectrum-tabs-icon-size: var(--spectrum-workflow-icon-size-50);
--spectrum-tabs-icon-to-text: var(--spectrum-text-to-visual-75);
--spectrum-tabs-top-to-icon: var(--spectrum-tab-item-top-to-workflow-icon-small);
--spectrum-tabs-focus-indicator-gap: var(--spectrum-tab-item-focus-indicator-gap-small);
--spectrum-tabs-font-size: var(--spectrum-font-size-75);
}

:host([size='l']) #list {
--spectrum-tabs-item-height: var(--spectrum-tab-item-height-large);
--spectrum-tabs-item-horizontal-spacing: var(--spectrum-tab-item-to-tab-item-horizontal-large);
--spectrum-tabs-item-vertical-spacing: var(--spectrum-tab-item-to-tab-item-vertical-large);
--spectrum-tabs-start-to-edge: var(--spectrum-tab-item-start-to-edge-large);
--spectrum-tabs-top-to-text: var(--spectrum-tab-item-top-to-text-large);
--spectrum-tabs-bottom-to-text: var(--spectrum-tab-item-bottom-to-text-large);
--spectrum-tabs-icon-size: var(--spectrum-workflow-icon-size-100);
--spectrum-tabs-icon-to-text: var(--spectrum-text-to-visual-200);
--spectrum-tabs-top-to-icon: var(--spectrum-tab-item-top-to-workflow-icon-large);
--spectrum-tabs-focus-indicator-gap: var(--spectrum-tab-item-focus-indicator-gap-large);
--spectrum-tabs-font-size: var(--spectrum-font-size-200);
}

:host([size='xl']) #list {
--spectrum-tabs-item-height: var(--spectrum-tab-item-height-extra-large);
--spectrum-tabs-item-horizontal-spacing: var(--spectrum-tab-item-to-tab-item-horizontal-extra-large);
--spectrum-tabs-item-vertical-spacing: var(--spectrum-tab-item-to-tab-item-vertical-extra-large);
--spectrum-tabs-start-to-edge: var(--spectrum-tab-item-start-to-edge-extra-large);
--spectrum-tabs-top-to-text: var(--spectrum-tab-item-top-to-text-extra-large);
--spectrum-tabs-bottom-to-text: var(--spectrum-tab-item-bottom-to-text-extra-large);
--spectrum-tabs-icon-size: var(--spectrum-workflow-icon-size-200);
--spectrum-tabs-icon-to-text: var(--spectrum-text-to-visual-300);
--spectrum-tabs-top-to-icon: var(--spectrum-tab-item-top-to-workflow-icon-extra-large);
--spectrum-tabs-focus-indicator-gap: var(--spectrum-tab-item-focus-indicator-gap-extra-large);
--spectrum-tabs-font-size: var(--spectrum-font-size-300);
}

:host([size='s']) #list.spectrum-Tabs--compact {
--spectrum-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-small));
--spectrum-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-small));
--spectrum-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-small));
--spectrum-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-small));
--mod-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-small));
Copy link
Contributor

Choose a reason for hiding this comment

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

I see the same pattern of overriding mods here, let's discuss!

Copy link
Contributor

Choose a reason for hiding this comment

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

Note the more specific mod in the stack: --mod-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-small)); - that's a very intentional override

Copy link
Contributor

Choose a reason for hiding this comment

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

To override the height for compact variants, you can use --mod-tabs-item-height-compact at any point in the cascade.

--mod-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-small));
--mod-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-small));
--mod-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-small));
}

:host([size='l']) #list.spectrum-Tabs--compact {
--spectrum-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-large));
--spectrum-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-large));
--spectrum-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-large));
--spectrum-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-large));
--mod-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-large));
--mod-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-large));
--mod-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-large));
--mod-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-large));
}

:host([size='xl']) #list.spectrum-Tabs--compact {
--spectrum-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-extra-large));
--spectrum-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-extra-large));
--spectrum-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-extra-large));
--spectrum-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-extra-large));
--mod-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-extra-large));
--mod-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-extra-large));
--mod-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-extra-large));
--mod-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-extra-large));
}
97 changes: 64 additions & 33 deletions packages/tabs/src/spectrum-tabs.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,69 @@ governing permissions and limitations under the License.
*/

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
#list {
--spectrum-tabs-item-height: var(--spectrum-tab-item-height-medium);
--spectrum-tabs-item-horizontal-spacing: var(--spectrum-tab-item-to-tab-item-horizontal-medium);
--spectrum-tabs-item-vertical-spacing: var(--spectrum-tab-item-to-tab-item-vertical-medium);
--spectrum-tabs-start-to-edge: var(--spectrum-tab-item-start-to-edge-medium);
--spectrum-tabs-top-to-text: var(--spectrum-tab-item-top-to-text-medium);
--spectrum-tabs-bottom-to-text: var(--spectrum-tab-item-bottom-to-text-medium);
--spectrum-tabs-icon-size: var(--spectrum-workflow-icon-size-75);
--spectrum-tabs-icon-to-text: var(--spectrum-text-to-visual-100);
--spectrum-tabs-top-to-icon: var(--spectrum-tab-item-top-to-workflow-icon-medium);
--spectrum-tabs-color: var(--spectrum-neutral-subdued-content-color-default);
--spectrum-tabs-color-selected: var(--spectrum-neutral-subdued-content-color-down);
--spectrum-tabs-color-hover: var(--spectrum-neutral-subdued-content-color-hover);
--spectrum-tabs-color-key-focus: var(--spectrum-neutral-subdued-content-color-key-focus);
--spectrum-tabs-color-disabled: var(--spectrum-gray-500);
--spectrum-tabs-font-family: var(--spectrum-sans-font-family-stack);
--spectrum-tabs-font-style: var(--spectrum-default-font-style);
--spectrum-tabs-font-size: var(--spectrum-font-size-100);
--spectrum-tabs-line-height: var(--spectrum-line-height-100);
--spectrum-tabs-focus-indicator-width: var(--spectrum-focus-indicator-thickness);
--spectrum-tabs-focus-indicator-border-radius: var(--spectrum-corner-radius-100);
--spectrum-tabs-focus-indicator-gap: var(--spectrum-tab-item-focus-indicator-gap-medium);
--spectrum-tabs-focus-indicator-color: var(--spectrum-focus-indicator-color);
--spectrum-tabs-selection-indicator-color: var(--spectrum-neutral-subdued-content-color-down);
--spectrum-tabs-list-background-direction: top;
--spectrum-tabs-divider-size: var(--spectrum-border-width-200);
--spectrum-tabs-divider-border-radius: 1px;
--spectrum-tabs-animation-duration: var(--spectrum-animation-duration-100);
--spectrum-tabs-animation-ease: var(--spectrum-animation-ease-in-out);
}

:host([emphasized]) #list {
--mod-tabs-color-selected: var(--mod-tabs-color-selected-emphasized, var(--spectrum-accent-content-color-default));
--mod-tabs-color-hover: var(--mod-tabs-color-hover-emphasized, var(--spectrum-accent-content-color-hover));
--mod-tabs-color-key-focus: var(--mod-tabs-color-key-focus-emphasized, var(--spectrum-accent-content-color-key-focus));
--mod-tabs-selection-indicator-color: var(--mod-tabs-selection-indicator-color-emphasized, var(--spectrum-accent-content-color-default));
}

:host([direction^='vertical']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical, right);
}

:host([direction^='vertical-right']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical-right, left);
}

:host([direction^='vertical']) #list:dir(rtl),
:host([dir='rtl'][direction^='vertical']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical, left);
}

:host([direction^='vertical-right']) #list:dir(rtl),
:host([dir='rtl'][direction^='vertical-right']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical, right);
}

:host([compact]) #list {
--mod-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-medium));
--mod-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-medium));
--mod-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-medium));
--mod-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-medium));
}

#list {
z-index: 0;
vertical-align: top;
Expand All @@ -21,13 +84,6 @@ governing permissions and limitations under the License.
position: relative;
}

:host([emphasized]) #list {
--mod-tabs-color-selected: var(--mod-tabs-color-selected-emphasized, var(--spectrum-tabs-color-selected));
--mod-tabs-color-hover: var(--mod-tabs-color-hover-emphasized, var(--spectrum-tabs-color-hover));
--mod-tabs-color-key-focus: var(--mod-tabs-color-key-focus-emphasized, var(--spectrum-tabs-color-key-focus));
--mod-tabs-selection-indicator-color: var(--mod-tabs-selection-indicator-color-emphasized, var(--spectrum-tabs-selection-indicator-color));
}

::slotted([selected]:not([slot])) {
color: var(--highcontrast-tabs-color-selected, var(--mod-tabs-color-selected, var(--spectrum-tabs-color-selected)));
}
Expand Down Expand Up @@ -77,11 +133,7 @@ governing permissions and limitations under the License.
}

:host([quiet]) #selection-indicator {
padding-inline-start: var(--mod-tabs-start-to-item-quiet, var(--spectrum-tabs-start-to-item-quiet));
}

:host([direction^='vertical']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical, right);
padding-inline-start: var(--mod-tabs-start-to-item-quiet);
}

:host([direction^='vertical']) #list,
Expand Down Expand Up @@ -119,31 +171,10 @@ governing permissions and limitations under the License.
inset-inline-start: 0;
}

:host([direction^='vertical-right']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical-right, left);
}

:host([direction^='vertical-right']) #list #selection-indicator {
inset-inline: auto 0;
}

:host([direction^='vertical']) #list:dir(rtl),
:host([dir='rtl'][direction^='vertical']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical, left);
}

:host([direction^='vertical-right']) #list:dir(rtl),
:host([dir='rtl'][direction^='vertical-right']) #list {
--mod-tabs-list-background-direction: var(--mod-tabs-list-background-direction-vertical, right);
}

:host([compact]) #list {
--spectrum-tabs-item-height: var(--mod-tabs-item-height-compact, var(--spectrum-tab-item-compact-height-medium));
--spectrum-tabs-top-to-text: var(--mod-tabs-top-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-medium));
--spectrum-tabs-bottom-to-text: var(--mod-tabs-bottom-to-text-compact, var(--spectrum-tab-item-top-to-text-compact-medium));
--spectrum-tabs-top-to-icon: var(--mod-tabs-top-to-icon-compact, var(--spectrum-tab-item-top-to-workflow-icon-compact-medium));
}

@media (forced-colors: active) {
#list {
--highcontrast-tabs-divider-background-color: var(--spectrum-gray-500);
Expand Down
57 changes: 0 additions & 57 deletions packages/tabs/src/tabs-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,64 +13,7 @@ governing permissions and limitations under the License.
/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
#list {
--spectrum-tabs-font-weight: var(--system-tabs-font-weight);
--spectrum-tabs-item-height: var(--system-tabs-item-height);
--spectrum-tabs-item-horizontal-spacing: var(
--system-tabs-item-horizontal-spacing
);
--spectrum-tabs-item-vertical-spacing: var(
--system-tabs-item-vertical-spacing
);
--spectrum-tabs-start-to-edge: var(--system-tabs-start-to-edge);
--spectrum-tabs-top-to-text: var(--system-tabs-top-to-text);
--spectrum-tabs-bottom-to-text: var(--system-tabs-bottom-to-text);
--spectrum-tabs-icon-size: var(--system-tabs-icon-size);
--spectrum-tabs-icon-to-text: var(--system-tabs-icon-to-text);
--spectrum-tabs-top-to-icon: var(--system-tabs-top-to-icon);
--spectrum-tabs-color: var(--system-tabs-color);
--spectrum-tabs-color-selected: var(--system-tabs-color-selected);
--spectrum-tabs-color-hover: var(--system-tabs-color-hover);
--spectrum-tabs-color-key-focus: var(--system-tabs-color-key-focus);
--spectrum-tabs-color-disabled: var(--system-tabs-color-disabled);
--spectrum-tabs-font-family: var(--system-tabs-font-family);
--spectrum-tabs-font-style: var(--system-tabs-font-style);
--spectrum-tabs-font-size: var(--system-tabs-font-size);
--spectrum-tabs-line-height: var(--system-tabs-line-height);
--spectrum-tabs-focus-indicator-width: var(
--system-tabs-focus-indicator-width
);
--spectrum-tabs-focus-indicator-border-radius: var(
--system-tabs-focus-indicator-border-radius
);
--spectrum-tabs-focus-indicator-gap: var(--system-tabs-focus-indicator-gap);
--spectrum-tabs-focus-indicator-color: var(
--system-tabs-focus-indicator-color
);
--spectrum-tabs-selection-indicator-color: var(
--system-tabs-selection-indicator-color
);
--spectrum-tabs-list-background-direction: var(
--system-tabs-list-background-direction
);
--spectrum-tabs-divider-background-color: var(
--system-tabs-divider-background-color
);
--spectrum-tabs-divider-size: var(--system-tabs-divider-size);
--spectrum-tabs-divider-border-radius: var(
--system-tabs-divider-border-radius
);
--spectrum-tabs-animation-duration: var(--system-tabs-animation-duration);
--spectrum-tabs-animation-ease: var(--system-tabs-animation-ease);
}

:host([emphasized]) #list {
--spectrum-tabs-color-selected: var(
--system-tabs-emphasized-color-selected
);
--spectrum-tabs-color-hover: var(--system-tabs-emphasized-color-hover);
--spectrum-tabs-color-key-focus: var(
--system-tabs-emphasized-color-key-focus
);
--spectrum-tabs-selection-indicator-color: var(
--system-tabs-emphasized-selection-indicator-color
);
}
59 changes: 0 additions & 59 deletions packages/tabs/src/tabs-sizes-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,62 +11,3 @@ governing permissions and limitations under the License.
*/

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
:host([size='s']) #list {
--spectrum-tabs-item-height: var(--system-tabs-size-s-item-height);
--spectrum-tabs-item-horizontal-spacing: var(
--system-tabs-size-s-item-horizontal-spacing
);
--spectrum-tabs-item-vertical-spacing: var(
--system-tabs-size-s-item-vertical-spacing
);
--spectrum-tabs-start-to-edge: var(--system-tabs-size-s-start-to-edge);
--spectrum-tabs-top-to-text: var(--system-tabs-size-s-top-to-text);
--spectrum-tabs-bottom-to-text: var(--system-tabs-size-s-bottom-to-text);
--spectrum-tabs-icon-size: var(--system-tabs-size-s-icon-size);
--spectrum-tabs-icon-to-text: var(--system-tabs-size-s-icon-to-text);
--spectrum-tabs-top-to-icon: var(--system-tabs-size-s-top-to-icon);
--spectrum-tabs-focus-indicator-gap: var(
--system-tabs-size-s-focus-indicator-gap
);
--spectrum-tabs-font-size: var(--system-tabs-size-s-font-size);
}

:host([size='l']) #list {
--spectrum-tabs-item-height: var(--system-tabs-size-l-item-height);
--spectrum-tabs-item-horizontal-spacing: var(
--system-tabs-size-l-item-horizontal-spacing
);
--spectrum-tabs-item-vertical-spacing: var(
--system-tabs-size-l-item-vertical-spacing
);
--spectrum-tabs-start-to-edge: var(--system-tabs-size-l-start-to-edge);
--spectrum-tabs-top-to-text: var(--system-tabs-size-l-top-to-text);
--spectrum-tabs-bottom-to-text: var(--system-tabs-size-l-bottom-to-text);
--spectrum-tabs-icon-size: var(--system-tabs-size-l-icon-size);
--spectrum-tabs-icon-to-text: var(--system-tabs-size-l-icon-to-text);
--spectrum-tabs-top-to-icon: var(--system-tabs-size-l-top-to-icon);
--spectrum-tabs-focus-indicator-gap: var(
--system-tabs-size-l-focus-indicator-gap
);
--spectrum-tabs-font-size: var(--system-tabs-size-l-font-size);
}

:host([size='xl']) #list {
--spectrum-tabs-item-height: var(--system-tabs-size-xl-item-height);
--spectrum-tabs-item-horizontal-spacing: var(
--system-tabs-size-xl-item-horizontal-spacing
);
--spectrum-tabs-item-vertical-spacing: var(
--system-tabs-size-xl-item-vertical-spacing
);
--spectrum-tabs-start-to-edge: var(--system-tabs-size-xl-start-to-edge);
--spectrum-tabs-top-to-text: var(--system-tabs-size-xl-top-to-text);
--spectrum-tabs-bottom-to-text: var(--system-tabs-size-xl-bottom-to-text);
--spectrum-tabs-icon-size: var(--system-tabs-size-xl-icon-size);
--spectrum-tabs-icon-to-text: var(--system-tabs-size-xl-icon-to-text);
--spectrum-tabs-top-to-icon: var(--system-tabs-size-xl-top-to-icon);
--spectrum-tabs-focus-indicator-gap: var(
--system-tabs-size-xl-focus-indicator-gap
);
--spectrum-tabs-font-size: var(--system-tabs-size-xl-font-size);
}
1 change: 0 additions & 1 deletion packages/tabs/src/tabs-sizes.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ governing permissions and limitations under the License.
*/

@import url('./spectrum-tabs-sizes.css');
@import url('./tabs-sizes-overrides.css');
Loading
Loading