Skip to content

refactor: remove mdc-system terminology and maps #31054

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

Merged
merged 9 commits into from
May 8, 2025
Merged

refactor: remove mdc-system terminology and maps #31054

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb9b53e
refactor: remove hardcode flag from m3 token maps
andrewseguin May 7, 2025
2ed82bc
refactor: directly use palettes instead of a ref
andrewseguin May 7, 2025
eb6b900
refactor: directly use typography instead of a ref
andrewseguin May 7, 2025
468679f
refactor: remove m3 ref files
andrewseguin May 7, 2025
949dd81
refactor: remove unused functions
andrewseguin May 7, 2025
8c1ea2c
refactor: lint
andrewseguin May 7, 2025
5a2a9f0
refactor: fix tests
andrewseguin May 7, 2025
e2cd3b4
refactor: continue using primary as a palette key
andrewseguin May 8, 2025
691b7b2
refactor: ensure some ref colors are included for select and sidenav
andrewseguin May 8, 2025
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
34 changes: 15 additions & 19 deletions src/material/core/theming/_definition.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,16 @@ $theme-version: 1;
$system-variables-prefix: map.get($config, system-variables-prefix) or $system-level-prefix;
sass-utils.$use-system-color-variables: map.get($config, use-system-variables) or false;

$palettes: map.set(
$primary, tertiary, map.remove($tertiary, neutral, neutral-variant, secondary, error));

@return (
$internals: (
theme-version: $theme-version,
theme-type: $type,
palettes: (
primary: map.remove($primary, neutral, neutral-variant, secondary),
secondary: map.get($primary, secondary),
tertiary: map.remove($tertiary, neutral, neutral-variant, secondary),
neutral: map.get($primary, neutral),
neutral-variant: map.get($primary, neutral-variant),
error: map.get($primary, error),
),
palettes: $palettes,
color-system-variables-prefix: $system-variables-prefix,
color-tokens: m3-tokens.generate-color-tokens(
$type, $primary, $tertiary, map.get($primary, error), $system-variables-prefix)
color-tokens: m3-tokens.generate-color-tokens($type, $palettes, $system-variables-prefix)
)
);
}
Expand All @@ -89,19 +84,20 @@ $theme-version: 1;
$system-variables-prefix: map.get($config, system-variables-prefix) or $system-level-prefix;
sass-utils.$use-system-typography-variables: map.get($config, use-system-variables) or false;

$typography: (
plain: $plain,
brand: $brand,
bold: $bold,
medium: $medium,
regular: $regular,
);

@return (
$internals: (
theme-version: $theme-version,
font-definition: (
plain: $plain,
brand: $brand,
bold: $bold,
medium: $medium,
regular: $regular,
),
font-definition: $typography,
typography-system-variables-prefix: $system-variables-prefix,
typography-tokens: m3-tokens.generate-typography-tokens(
$brand, $plain, $bold, $medium, $regular, $system-variables-prefix)
typography-tokens: m3-tokens.generate-typography-tokens($typography, $system-variables-prefix)
)
);
}
Expand Down
21 changes: 18 additions & 3 deletions src/material/core/theming/tests/theming-definition-api.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,27 @@ describe('theming definition api', () => {
expect(vars['version']).toBe('1');
expect(vars['type']).toBe('light');
expect(vars['palettes'].split(', ')).toEqual([
'primary',
'0',
'10',
'20',
'25',
'30',
'35',
'40',
'50',
'60',
'70',
'80',
'90',
'95',
'98',
'99',
'100',
'secondary',
'tertiary',
'neutral',
'neutral-variant',
'error',
'tertiary',
]);
expect(vars['density']).toBe('0');
expect(vars['base-tokens']).toBe('true');
Expand All @@ -114,7 +129,7 @@ describe('theming definition api', () => {
--token-primary: #{map.get($data, color-tokens, (mat, theme), primary)};
--token-secondary: #{map.get($data, color-tokens, (mat, theme), secondary)};
--token-tertiary: #{map.get($data, color-tokens, (mat, theme), tertiary)};
--palette-primary: #{map.get($data, palettes, primary, 50)};
--palette-primary: #{map.get($data, palettes, 50)};
--palette-secondary: #{map.get($data, palettes, secondary, 50)};
--palette-tertiary: #{map.get($data, palettes, tertiary, 50)};
--type: #{map.get($data, theme-type)};
Expand Down
58 changes: 24 additions & 34 deletions src/material/core/tokens/_m3-system.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
@use '../style/sass-utils';
@use '../theming/config-validation';
@use '../theming/definition';
@use '../theming/palettes';
@use './m3';
@use './m3-tokens';
@use 'sass:list';
Expand Down Expand Up @@ -130,8 +131,14 @@
/// change the primary color to red, use `mat.theme-overrides((primary: red));`
@mixin theme-overrides($overrides, $prefix: definition.$system-fallback-prefix) {
$sys-names: map-merge-all(
m3.md-sys-color-values-light(),
m3.md-sys-typescale-values(),
m3.md-sys-color-values-light(palettes.$blue-palette),
m3.md-sys-typescale-values((
brand: (Roboto),
plain: (Roboto),
bold: 700,
medium: 500,
regular: 400
)),
m3.md-sys-elevation-values(),
m3.md-sys-shape-values(),
m3.md-sys-state-values());
Expand All @@ -147,35 +154,20 @@

@mixin system-level-colors($theme, $overrides: (), $prefix: null) {
$palettes: map.get($theme, _mat-theming-internals-do-not-access, palettes);
$base-palettes: (
neutral: map.get($palettes, neutral),
neutral-variant: map.get($palettes, neutral-variant),
secondary: map.get($palettes, secondary),
error: map.get($palettes, error),
);

$type: map.get($theme, _mat-theming-internals-do-not-access, theme-type);
$primary: map.merge(map.get($palettes, primary), $base-palettes);
$tertiary: map.merge(map.get($palettes, tertiary), $base-palettes);
$error: map.get($palettes, error);

@if (not $prefix) {
$prefix: map.get($theme, _mat-theming-internals-do-not-access,
color-system-variables-prefix) or definition.$system-level-prefix;
}

$ref: (
md-ref-palette: m3-tokens.generate-ref-palette-tokens($primary, $tertiary, $error)
);

$sys-colors: _generate-sys-colors($ref, $type);
$sys-colors: _generate-sys-colors($palettes, $type);

// Manually insert a subset of palette values that are used directly by components
// instead of system variables.
$sys-colors: map.set($sys-colors,
'neutral-variant20', map.get($ref, md-ref-palette, neutral-variant20));
$sys-colors: map.set($sys-colors,
'neutral10', map.get($ref, md-ref-palette, neutral10));
$sys-colors: map.set($sys-colors, neutral-variant20, map.get($palettes, neutral-variant, 20));
$sys-colors: map.set($sys-colors, neutral10, map.get($palettes, neutral, 10));

& {
@each $name, $value in $sys-colors {
Expand All @@ -184,13 +176,13 @@
}
}

@function _generate-sys-colors($ref, $type) {
$light-sys-colors: m3.md-sys-color-values-light($ref);
@function _generate-sys-colors($palettes, $type) {
$light-sys-colors: m3.md-sys-color-values-light($palettes);
@if ($type == light) {
@return $light-sys-colors;
}

$dark-sys-colors: m3.md-sys-color-values-dark($ref);
$dark-sys-colors: m3.md-sys-color-values-dark($palettes);
@if ($type == dark) {
@return $dark-sys-colors;
}
Expand All @@ -210,22 +202,14 @@

@mixin system-level-typography($theme, $overrides: (), $prefix: null) {
$font-definition: map.get($theme, _mat-theming-internals-do-not-access, font-definition);
$brand: map.get($font-definition, brand);
$plain: map.get($font-definition, plain);
$bold: map.get($font-definition, bold);
$medium: map.get($font-definition, medium);
$regular: map.get($font-definition, regular);
$ref: (md-ref-typeface:
m3-tokens.generate-ref-typeface-tokens($brand, $plain, $bold, $medium, $regular)
);

@if (not $prefix) {
$prefix: map.get($theme, _mat-theming-internals-do-not-access,
typography-system-variables-prefix) or definition.$system-level-prefix;
}

& {
@each $name, $value in m3.md-sys-typescale-values($ref) {
@each $name, $value in m3.md-sys-typescale-values($font-definition) {
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
}
}
Expand Down Expand Up @@ -277,9 +261,15 @@
@function create-system-fallbacks() {
$app-vars: (
'md-sys-color':
_create-system-app-vars-map(m3.md-sys-color-values-light()),
_create-system-app-vars-map(m3.md-sys-color-values-light(palettes.$blue-palette)),
'md-sys-typescale':
_create-system-app-vars-map(m3.md-sys-typescale-values()),
_create-system-app-vars-map(m3.md-sys-typescale-values((
brand: (Roboto),
plain: (Roboto),
bold: 700,
medium: 500,
regular: 400
))),
'md-sys-elevation':
_create-system-app-vars-map(m3.md-sys-elevation-values()),
'md-sys-state':
Expand Down
Loading
Loading