Skip to content

Commit f85db9b

Browse files
committed
fix(material/slide-toggle): wrap hardcoded custom tokens
1 parent e9582a6 commit f85db9b

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

src/material-experimental/theming/_custom-tokens.scss

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,8 @@
11741174
/// @return {Map} A set of custom tokens for the mat-slide-toggle
11751175
@function switch($systems, $exclude-hardcoded) {
11761176
@return (
1177+
disabled-selected-handle-opacity: _hardcode(1, $exclude-hardcoded),
1178+
disabled-unselected-handle-opacity: _hardcode(0.38, $exclude-hardcoded),
11771179
unselected-handle-size: _hardcode(16px, $exclude-hardcoded),
11781180
selected-handle-size: _hardcode(24px, $exclude-hardcoded),
11791181
with-icon-handle-size: _hardcode(24px, $exclude-hardcoded),
@@ -1190,12 +1192,14 @@
11901192
//
11911193
// The m2 slide-toggle uses transforms to hide & show the tracks while
11921194
// the m3 slide-toggle uses opacity.
1193-
visible-track-opacity: 1,
1194-
hidden-track-opacity: 0,
1195-
visible-track-transition: opacity 75ms,
1196-
hidden-track-transition: opacity 75ms,
1197-
track-outline: 2px solid map.get($systems, md-sys-color, outline),
1198-
disabled-unselected-track-outline: 2px solid map.get($systems, md-sys-color, on-surface),
1195+
visible-track-opacity: _hardcode(1, $exclude-hardcoded),
1196+
hidden-track-opacity: _hardcode(0, $exclude-hardcoded),
1197+
visible-track-transition: _hardcode(opacity 75ms, $exclude-hardcoded),
1198+
hidden-track-transition: _hardcode(opacity 75ms, $exclude-hardcoded),
1199+
track-outline-width: _hardcode(2px, $exclude-hardcoded),
1200+
track-outline-color: map.get($systems, md-sys-color, outline),
1201+
disabled-unselected-track-outline-width: _hardcode(2px, $exclude-hardcoded),
1202+
disabled-unselected-track-outline-color: map.get($systems, md-sys-color, on-surface),
11991203
), ();
12001204
}
12011205

src/material/slide-toggle/slide-toggle.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,14 @@
216216
@include token-utils.use-tokens(m2-mat-switch.$prefix, m2-mat-switch.get-token-slots()) {
217217
.mdc-switch__track::after,
218218
.mdc-switch__track::before {
219-
@include token-utils.create-token-slot(border, track-outline);
219+
@include token-utils.create-token-slot(border-width, track-outline-width);
220+
@include token-utils.create-token-slot(border-color, track-outline-color);
220221
}
221222

222223
.mdc-switch--disabled .mdc-switch__track::after,
223224
.mdc-switch--disabled .mdc-switch__track::before {
224-
@include token-utils.create-token-slot(border, disabled-unselected-track-outline);
225+
@include token-utils.create-token-slot(border-width, disabled-unselected-track-outline-width);
226+
@include token-utils.create-token-slot(border-color, disabled-unselected-track-outline-color);
225227
}
226228
}
227229

0 commit comments

Comments
 (0)