Skip to content

Commit eed75dd

Browse files
authored
fix(material/slide-toggle): move unthemable tokens to theme mixin (#27905)
Though these tokens are not currently affected by the theme, in the future they will be affected by the design system used for theming (M2 or M3) BREAKING CHANGE: There are new styles emitted by mat.slide-toggle-theme that are not emitted by any of: mat.slide-toggle-color, mat.slide-toggle-typography, mat.slide-toggle-density. If you rely on the partial mixins only and don't call mat.slide-toggle-theme, you can add mat.slide-toggle-base to get the missing styles.
1 parent bcbdf91 commit eed75dd

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src/material/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ menu-base;
120120
@forward './sidenav/sidenav-theme' as sidenav-* show sidenav-theme, sidenav-color,
121121
sidenav-typography, sidenav-density, sidenav-base;
122122
@forward './slide-toggle/slide-toggle-theme' as slide-toggle-* show
123-
slide-toggle-theme, slide-toggle-color, slide-toggle-typography, slide-toggle-density;
123+
slide-toggle-theme, slide-toggle-color, slide-toggle-typography, slide-toggle-density,
124+
slide-toggle-base;
124125
@forward './slider/slider-theme' as slider-* show slider-theme, slider-color, slider-typography,
125126
slider-density, slider-base;
126127
@forward './snack-bar/snack-bar-theme' as snack-bar-* show snack-bar-theme, snack-bar-color,

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
@use '../core/tokens/m2/mat/slide-toggle' as m2-mat-slide-toggle;
99
@use '../core/tokens/token-utils';
1010

11+
@mixin base($theme) {
12+
.mdc-switch {
13+
@include mdc-switch-theme.theme(m2-mdc-switch.get-unthemable-tokens());
14+
}
15+
}
16+
1117
@mixin color($theme) {
1218
$is-dark: inspection.get-theme-type($theme) == dark;
1319
$mdc-switch-color-tokens: m2-mdc-switch.get-color-tokens($theme);
@@ -62,6 +68,7 @@
6268

6369
@mixin theme($theme) {
6470
@include theming.private-check-duplicate-theme-styles($theme, 'mat-slide-toggle') {
71+
@include base($theme);
6572
@if inspection.theme-has($theme, color) {
6673
@include color($theme);
6774
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
&:disabled .mdc-switch__shadow {
3939
box-shadow: var(--mdc-switch-disabled-handle-elevation-shadow);
4040
}
41-
42-
// Add default values for MDC switch tokens that aren't outputted by the theming API
43-
@include mdc-switch-theme.theme(m2-mdc-switch.get-unthemable-tokens());
4441
}
4542

4643

0 commit comments

Comments
 (0)