Skip to content

Commit 4b49d73

Browse files
authoredOct 23, 2024
feat(material/core): switch system prefix from sys to mat-sys (#29908)
# Conflicts: # src/material/core/tokens/_m3-system.scss
1 parent a8e40ec commit 4b49d73

File tree

3 files changed

+29
-25
lines changed

3 files changed

+29
-25
lines changed
 

‎src/material/core/theming/_definition.scss

+12-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
@use '../tokens/m3-tokens';
77
@use './config-validation';
88

9+
// Prefix used for component token fallback variables, e.g.
10+
// `color: var(--mdc-text-button-label-text-color, var(--mat-sys-primary));`
11+
$system-fallback-prefix: mat-sys;
12+
13+
// Default system level prefix to use when directly calling the `system-level-*` mixins.
14+
// Prefix used for component token fallback variables, e.g.
15+
// `color: var(--mdc-text-button-label-text-color, var(--mat-sys-primary));`
16+
// TODO: Remove this variable after internal clients are migrated from "sys"
17+
$system-level-prefix: mat-sys;
18+
919
/// Map key used to store internals of theme config.
1020
$internals: _mat-theming-internals-do-not-access;
1121
/// The theme version of generated themes.
@@ -40,7 +50,7 @@ $theme-version: 1;
4050
$type: map.get($config, theme-type) or light;
4151
$primary: map.get($config, primary) or palettes.$violet-palette;
4252
$tertiary: map.get($config, tertiary) or $primary;
43-
$system-variables-prefix: map.get($config, system-variables-prefix) or sys;
53+
$system-variables-prefix: map.get($config, system-variables-prefix) or $system-level-prefix;
4454
sass-utils.$use-system-color-variables: map.get($config, use-system-variables) or false;
4555

4656
@return (
@@ -76,7 +86,7 @@ $theme-version: 1;
7686
$bold: map.get($config, bold-weight) or 700;
7787
$medium: map.get($config, medium-weight) or 500;
7888
$regular: map.get($config, regular-weight) or 400;
79-
$system-variables-prefix: map.get($config, system-variables-prefix) or sys;
89+
$system-variables-prefix: map.get($config, system-variables-prefix) or $system-level-prefix;
8090
sass-utils.$use-system-typography-variables: map.get($config, use-system-variables) or false;
8191

8292
@return (

‎src/material/core/theming/tests/theming-definition-api.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ describe('theming definition api', () => {
9696
expect(vars['color-tokens']).toBe('true');
9797
expect(vars['typography-tokens']).toBe('true');
9898
expect(vars['density-tokens']).toBe('true');
99-
expect(vars['typography-system-variables-prefix']).toBe('sys');
100-
expect(vars['color-system-variables-prefix']).toBe('sys');
99+
expect(vars['typography-system-variables-prefix']).toBe('mat-sys');
100+
expect(vars['color-system-variables-prefix']).toBe('mat-sys');
101101
});
102102

103103
it('should customize colors', () => {

‎src/material/core/tokens/_m3-system.scss

+15-21
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
@use 'sass:list';
99
@use './m3-tokens';
1010

11-
// Prefix used for component token fallback variables, e.g.
12-
// `color: var(--mdc-text-button-label-text-color, var(--mat-sys-primary));`
13-
$_system-fallback-prefix: mat-sys;
14-
15-
// Default system level prefix to use when directly calling the `system-level-*` mixins
16-
$_system-level-prefix: sys;
17-
1811
/// Emits necessary CSS variables for Material's system level values for the values defined in the
1912
/// config map. The config map can have values color, typography, and/or density.
2013
///
@@ -56,8 +49,8 @@ $_system-level-prefix: sys;
5649
$color-config: if($is-palette,
5750
definition.define-colors((primary: $color, theme-type: color-scheme)),
5851
definition.define-colors($color));
59-
@include system-level-colors($color-config, $overrides, $_system-fallback-prefix);
60-
@include system-level-elevation($color-config, $overrides, $_system-fallback-prefix);
52+
@include system-level-colors($color-config, $overrides, definition.$system-fallback-prefix);
53+
@include system-level-elevation($color-config, $overrides, definition.$system-fallback-prefix);
6154
}
6255

6356
$typography: map.get($config, typography);
@@ -66,7 +59,8 @@ $_system-level-prefix: sys;
6659
$typography-config: if(meta.type-of($typography) == 'map',
6760
definition.define-typography($typography),
6861
definition.define-typography((plain-family: $typography)));
69-
@include system-level-typography($typography-config, $overrides, $_system-fallback-prefix);
62+
@include system-level-typography(
63+
$typography-config, $overrides, definition.$system-fallback-prefix);
7064
}
7165

7266
$density: map.get($config, density);
@@ -88,14 +82,14 @@ $_system-level-prefix: sys;
8882
}
8983
}
9084

91-
@include system-level-shape($overrides: $overrides, $prefix: $_system-fallback-prefix);
92-
@include system-level-motion($overrides:$overrides, $prefix: $_system-fallback-prefix);
93-
@include system-level-state($overrides: $overrides, $prefix: $_system-fallback-prefix);
85+
@include system-level-shape($overrides: $overrides, $prefix: definition.$system-fallback-prefix);
86+
@include system-level-motion($overrides:$overrides, $prefix: definition.$system-fallback-prefix);
87+
@include system-level-state($overrides: $overrides, $prefix: definition.$system-fallback-prefix);
9488
}
9589

9690
/// Emits the system-level CSS variables for each of the provided override values. E.g. to
9791
/// change the primary color to red, use `mat.theme-overrides((primary: red));`
98-
@mixin theme-overrides($overrides, $prefix: $_system-fallback-prefix) {
92+
@mixin theme-overrides($overrides, $prefix: definition.$system-fallback-prefix) {
9993
$sys-names: map-merge-all(
10094
definitions.md-sys-color-values-light(),
10195
definitions.md-sys-typescale-values(),
@@ -128,7 +122,7 @@ $_system-level-prefix: sys;
128122

129123
@if (not $prefix) {
130124
$prefix: map.get($theme, _mat-theming-internals-do-not-access,
131-
color-system-variables-prefix) or $_system-level-prefix;
125+
color-system-variables-prefix) or definition.$system-level-prefix;
132126
}
133127

134128
$ref: (
@@ -188,7 +182,7 @@ $_system-level-prefix: sys;
188182

189183
@if (not $prefix) {
190184
$prefix: map.get($theme, _mat-theming-internals-do-not-access,
191-
typography-system-variables-prefix) or $_system-level-prefix;
185+
typography-system-variables-prefix) or definition.$system-level-prefix;
192186
}
193187

194188
& {
@@ -198,7 +192,7 @@ $_system-level-prefix: sys;
198192
}
199193
}
200194

201-
@mixin system-level-elevation($theme, $overrides: (), $prefix: $_system-level-prefix) {
195+
@mixin system-level-elevation($theme, $overrides: (), $prefix: definition.$system-level-prefix) {
202196
$shadow-color: map.get(
203197
$theme, _mat-theming-internals-do-not-access, color-tokens, (mdc, theme), shadow);
204198

@@ -211,23 +205,23 @@ $_system-level-prefix: sys;
211205
}
212206
}
213207

214-
@mixin system-level-shape($theme: (), $overrides: (), $prefix: $_system-level-prefix) {
208+
@mixin system-level-shape($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
215209
& {
216210
@each $name, $value in definitions.md-sys-shape-values() {
217211
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
218212
}
219213
}
220214
}
221215

222-
@mixin system-level-state($theme: (), $overrides: (), $prefix: $_system-level-prefix) {
216+
@mixin system-level-state($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
223217
& {
224218
@each $name, $value in definitions.md-sys-state-values() {
225219
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
226220
}
227221
}
228222
}
229223

230-
@mixin system-level-motion($theme: (), $overrides: (), $prefix: $_system-level-prefix) {
224+
@mixin system-level-motion($theme: (), $overrides: (), $prefix: definition.$system-level-prefix) {
231225
& {
232226
@each $name, $value in definitions.md-sys-motion-values() {
233227
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
@@ -241,7 +235,7 @@ $_system-level-prefix: sys;
241235
@function _create-system-app-vars-map($map) {
242236
$new-map: ();
243237
@each $key, $value in $map {
244-
$new-map: map.set($new-map, $key, --#{$_system-fallback-prefix}-#{$key});
238+
$new-map: map.set($new-map, $key, --#{definition.$system-fallback-prefix}-#{$key});
245239
}
246240
@return $new-map;
247241
}

0 commit comments

Comments
 (0)