Skip to content
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

feat(switch): add stateful component tokens #8846

Merged
merged 6 commits into from
Mar 14, 2024
Merged

feat(switch): add stateful component tokens #8846

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79a371a
feat(switch): add stateful component tokens
jcfranco Feb 27, 2024
680c8b9
follow fallback pattern
jcfranco Mar 8, 2024
39d99f4
remove invalid declaration
jcfranco Mar 8, 2024
c605cbb
use checked vs selected in prop names to match API
jcfranco Mar 8, 2024
8cfa360
improve prop descriptions
jcfranco Mar 8, 2024
1b6dcb7
drop non-subcomponent-related state props
jcfranco Mar 13, 2024
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
59 changes: 30 additions & 29 deletions packages/calcite-components/src/components/switch/switch.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,15 @@
*
* These properties can be overridden using the component's tag as selector.
*
* @prop --calcite-switch-corner-radius: Specifies the corner radius of the component.
* @prop --calcite-switch-handle-background-color: Specifies the background color of the component handle.
* @prop --calcite-switch-handle-border-color: Specifies the border color of the component handle.
* @prop --calcite-switch-handle-shadow: Specifies the shadow of the component handle.
* @prop --calcite-switch-track-background-color: Specifies the background color of the component track.
* @prop --calcite-switch-track-border-color: Specifies the border color of the component track.
* @prop --calcite-switch-corner-radius: Specifies the corner radius of the component.
* @prop --calcite-switch-shadow: Specifies the shadow of the component.
*/

@import "~@esri/calcite-design-tokens/dist/scss/core";

:host {
--calcite-switch-handle-background-color: var(--calcite-color-foreground-1);
--calcite-switch-handle-border-color: var(--calcite-color-border-input);
--calcite-switch-track-background-color: var(--calcite-color-foreground-2);
--calcite-switch-track-border-color: var(--calcite-color-border-2);
--calcite-switch-corner-radius: var(--calcite-internal-switch-border-radius, --calcite-corner-radius-pill);
--calcite-switch-shadow: none;

--calcite-internal-switch-border-radius: 9999px; // TODO: drop once --calcite-corner-radius is updated

@apply relative
Expand All @@ -29,7 +20,6 @@
cursor-pointer
select-none
align-middle;
tap-highlight-color: transparent;
}

.container {
Expand All @@ -47,9 +37,12 @@
pointer-events-none
relative;

border-color: var(--calcite-switch-track-border-color);
background-color: var(--calcite-switch-track-background-color);
border-radius: var(--calcite-switch-corner-radius);
border-color: var(--calcite-switch-track-border-color, var(--calcite-color-border-2));
background-color: var(--calcite-switch-track-background-color, var(--calcite-color-foreground-2));
border-radius: var(
--calcite-switch-corner-radius,
var(--calcite-internal-switch-border-radius, var(--calcite-corner-radius-pill))
);
block-size: var(--calcite-internal-switch-track-height);
inline-size: var(--calcite-internal-switch-track-width);
}
Expand All @@ -66,15 +59,17 @@
inset-block-start: -1px;
inset-inline: -1px theme("inset.auto");

border-color: var(--calcite-switch-handle-border-color);
background-color: var(--calcite-switch-handle-background-color);
border-radius: var(--calcite-switch-corner-radius);
box-shadow: inset 0 0 0 1px var(--calcite-switch-shadow);
border-color: var(--calcite-switch-handle-border-color, var(--calcite-color-border-input));
background-color: var(--calcite-switch-handle-background-color, var(--calcite-color-foreground-1));
border-radius: var(
--calcite-switch-corner-radius,
var(--calcite-internal-switch-border-radius, var(--calcite-corner-radius-pill))
);
box-shadow: var(--calcite-switch-handle-shadow, none);
block-size: var(--calcite-internal-switch-handle-height);
inline-size: var(--calcite-internal-switch-handle-width);
}

// sizes
:host([scale="s"]) {
--calcite-internal-switch-handle-height: var(--calcite-size-sm);
--calcite-internal-switch-handle-width: var(--calcite-size-sm);
Expand All @@ -93,7 +88,7 @@
--calcite-internal-switch-handle-height: var(--calcite-size-xl);
--calcite-internal-switch-handle-width: var(--calcite-size-xl);
--calcite-internal-switch-track-height: var(--calcite-size-xxl);
--calcite-internal-switch-track-width: #{$calcite-size-48}; // TODO: need new size token for this size
--calcite-internal-switch-track-width: #{$calcite-size-48};
}

:host(:focus) .track {
Expand All @@ -102,28 +97,34 @@

:host(:hover),
:host(:focus) {
--calcite-switch-handle-border-color: var(--calcite-color-brand);
--calcite-switch-shadow: var(--calcite-color-brand);
.handle {
border-color: var(--calcite-switch-handle-border-color, var(--calcite-color-brand));
box-shadow: var(--calcite-switch-handle-shadow, inset 0 0 0 1px var(--calcite-color-brand));
}
}

:host([checked]) {
--calcite-switch-handle-border-color: var(--calcite-color-brand);
--calcite-switch-track-background-color: var(--calcite-color-brand);
--calcite-switch-track-border-color: var(--calcite-color-brand-hover);
.track {
background-color: var(--calcite-switch-track-background-color, var(--calcite-color-brand));
border-color: var(--calcite-switch-track-border-color, var(--calcite-color-brand));
}

.handle {
border-color: var(--calcite-switch-handle-border-color, var(--calcite-color-brand));
inset-inline: theme("inset.auto") -1px;
}
}

:host([checked]:hover) {
--calcite-switch-handle-border-color: var(--calcite-color-brand-hover);
--calcite-switch-shadow: var(--calcite-color-brand-hover);
.handle {
border-color: var(--calcite-switch-handle-border-color, var(--calcite-color-brand-hover));
box-shadow: var(--calcite-switch-handle-shadow, inset 0 0 0 1px var(--calcite-color-brand-hover));
}
}

@media (forced-colors: active) {
:host([checked]) {
--calcite-switch-track-background-color: canvasText;
background-color: canvasText;
}
}

Expand Down
Loading