Skip to content

Commit c10f376

Browse files
authored
fix(material/slide-toggle): use token system for label text (#31366)
1 parent ca83d31 commit c10f376

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
@return map.merge(
7070
private-get-color-palette-color-tokens($theme, primary),
7171
(
72+
slide-toggle-disabled-label-text-color:
73+
m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
7274
slide-toggle-disabled-handle-elevation-shadow: elevation.get-box-shadow(0),
7375
slide-toggle-disabled-selected-handle-color: map.get($system, on-surface),
7476
slide-toggle-disabled-selected-track-color: map.get($system, on-surface),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
slide-toggle-handle-height: null,
6161
),
6262
color: (
63+
slide-toggle-disabled-label-text-color: map.get($system, on-surface),
6364
slide-toggle-disabled-selected-handle-color: map.get($system, surface),
6465
slide-toggle-disabled-selected-icon-color: map.get($system, on-surface),
6566
slide-toggle-disabled-selected-track-color: map.get($system, on-surface),

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
@use './m2-slide-toggle';
77
@use './m3-slide-toggle';
88
@use '../core/tokens/m2-utils';
9-
@use '../core/tokens/m3-utils';
109

1110
/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
1211
/// for the mat-slide-toggle.
@@ -35,20 +34,7 @@
3534
$mat-tokens: m2-slide-toggle.get-color-tokens($theme);
3635
$system: m2-utils.get-system($theme);
3736

38-
@include sass-utils.current-selector-or-root() {
39-
// TODO(andrewjs): Remove this once all tokens are migrated to
40-
// mat internally.
41-
--mdc-slide-toggle-disabled-label-text-color: #{
42-
m3-utils.color-with-opacity(map.get($system, on-surface), 38%)};
43-
// TODO(wagnermaciel): Use our token system to define this css variable.
44-
--mat-slide-toggle-disabled-label-text-color: #{
45-
m3-utils.color-with-opacity(map.get($system, on-surface), 38%)};
46-
}
47-
4837
.mat-mdc-slide-toggle {
49-
// TODO(wagnermaciel): Use our token system to define this css variable.
50-
--mat-slide-toggle-label-text-color: #{map.get($system, on-surface)};
51-
5238
// Change the color palette related tokens to accent or warn if applicable
5339
&.mat-accent {
5440
$tokens: m2-slide-toggle.private-get-color-palette-color-tokens($theme, secondary);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,7 @@ $fallbacks: m3-slide-toggle.get-tokens();
538538
cursor: pointer;
539539
}
540540

541-
// TODO(wagnermaciel): Use our custom token system to emit this css rule.
542541
.mdc-switch--disabled + label {
543-
color: var(--mat-slide-toggle-disabled-label-text-color);
542+
color: token-utils.slot(slide-toggle-disabled-label-text-color, $fallbacks);
544543
}
545544
}

0 commit comments

Comments
 (0)