Skip to content

fix(material/core): include alternative tokens #30633

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 1 commit into from
Mar 16, 2025
Merged

fix(material/core): include alternative tokens #30633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion src/material/core/tokens/m3/definitions/_md-comp-elevated-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

@use './md-sys-state';

// Indicates whether alternative tokens should be used
$_alternate-tokens: false;

$_default: (
'md-sys-color': md-sys-color.values-light(),
'md-sys-elevation': md-sys-elevation.values(),
Expand All @@ -21,7 +24,7 @@ $_default: (
);

@function values($deps: $_default, $exclude-hardcoded-values: false) {
@return (
$values: (
'container-color': map.get($deps, 'md-sys-color', 'surface-container-low'),
'container-elevation': map.get($deps, 'md-sys-elevation', 'level1'),
'container-shadow-color': map.get($deps, 'md-sys-color', 'shadow'),
Expand Down Expand Up @@ -50,4 +53,12 @@ $_default: (
'pressed-state-layer-opacity':
map.get($deps, 'md-sys-state', 'pressed-state-layer-opacity')
);

@if ($_alternate-tokens) {
$values: map.merge($values, (
'container-color': map.get($deps, 'md-sys-color', 'surface'),
));
}

@return $values;
}
46 changes: 44 additions & 2 deletions src/material/core/tokens/m3/definitions/_md-sys-color.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@

@use './md-ref-palette';

// Indicates whether alternative tokens should be used
$_alternate-tokens: false;

$_default-dark: (
'md-ref-palette': md-ref-palette.values(),
);

@function values-dark($deps: $_default-dark) {
@return (
$values: (
'background': map.get($deps, 'md-ref-palette', 'neutral6'),
'error': map.get($deps, 'md-ref-palette', 'error80'),
'error-container': map.get($deps, 'md-ref-palette', 'error30'),
Expand Down Expand Up @@ -64,14 +67,32 @@ $_default-dark: (
'tertiary-fixed': map.get($deps, 'md-ref-palette', 'tertiary90'),
'tertiary-fixed-dim': map.get($deps, 'md-ref-palette', 'tertiary80')
);

@if ($_alternate-tokens) {
$values: map.merge($values, (
'background': map.get($deps, 'md-ref-palette', 'neutral10'),
'on-surface-variant': map.get($deps, 'md-ref-palette', 'neutral-variant80'),
'surface': map.get($deps, 'md-ref-palette', 'neutral10'),
'surface-bright': #37393b,
'surface-container': #1e1f20,
'surface-container-high': #282a2c,
'surface-container-highest': #333537,
'surface-container-low': #1b1b1b,
'surface-container-lowest': #0e0e0e,
'surface-dim': #131313,
'surface-tint': #d1e1ff,
));
}

@return $values;
}

$_default-light: (
'md-ref-palette': md-ref-palette.values(),
);

@function values-light($deps: $_default-light) {
@return (
$values: (
'background': map.get($deps, 'md-ref-palette', 'neutral98'),
'error': map.get($deps, 'md-ref-palette', 'error40'),
'error-container': map.get($deps, 'md-ref-palette', 'error90'),
Expand Down Expand Up @@ -123,4 +144,25 @@ $_default-light: (
'tertiary-fixed': map.get($deps, 'md-ref-palette', 'tertiary90'),
'tertiary-fixed-dim': map.get($deps, 'md-ref-palette', 'tertiary80')
);

@if ($_alternate-tokens) {
$values: map.merge($values, (
'background': map.get($deps, 'md-ref-palette', 'neutral100'),
'on-error-container': map.get($deps, 'md-ref-palette', 'error10'),
'on-primary-container': map.get($deps, 'md-ref-palette', 'primary10'),
'on-secondary-container': map.get($deps, 'md-ref-palette', 'secondary10'),
'on-tertiary-container': map.get($deps, 'md-ref-palette', 'tertiary10'),
'surface': map.get($deps, 'md-ref-palette', 'neutral100'),
'surface-bright': map.get($deps, 'md-ref-palette', 'neutral100'),
'surface-container': #f0f4f9,
'surface-container-high': #e9eef6,
'surface-container-highest': #dde3ea,
'surface-container-low': #f8fafd,
'surface-container-lowest': map.get($deps, 'md-ref-palette', 'primary100'),
'surface-dim': #d3dbe5,
'surface-tint': #6991d6,
));
}

@return $values;
}
21 changes: 20 additions & 1 deletion src/material/core/tokens/m3/definitions/_md-sys-typescale.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@

@use './md-ref-typeface';

// Indicates whether alternative tokens should be used
$_alternate-tokens: false;

$_default: (
'md-ref-typeface': md-ref-typeface.values(),
);

@function values($deps: $_default, $exclude-hardcoded-values: false) {
@return (
$values: (
// Warning: risk of reduced fidelity from using this composite typography token.
// Tokens md.sys.typescale.body-large.tracking cannot be represented in the "font"
// property shorthand. Consider using the discrete properties instead.
Expand Down Expand Up @@ -305,4 +308,20 @@ $_default: (
'title-small-tracking': if($exclude-hardcoded-values, null, 0.006rem),
'title-small-weight': map.get($deps, 'md-ref-typeface', 'weight-medium')
);

@if ($_alternate-tokens) {
$values: map.merge($values, (
'body-large-tracking': if($exclude-hardcoded-values, null, 0),
'body-medium-tracking': if($exclude-hardcoded-values, null, 0),
'body-small-tracking': if($exclude-hardcoded-values, null, 0.006rem),
'display-large-tracking': if($exclude-hardcoded-values, null, 0),
'label-large-tracking': if($exclude-hardcoded-values, null, 0),
'label-medium-tracking': if($exclude-hardcoded-values, null, 0.006rem),
'label-small-tracking': if($exclude-hardcoded-values, null, 0.006rem),
'title-medium-tracking': if($exclude-hardcoded-values, null, 0),
'title-small-tracking': if($exclude-hardcoded-values, null, 0),
));
}

@return $values;
}
Loading