Skip to content
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

feat(material/theming): Expose tonal palette values in the system level variables #30334

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(material/theming): Expose tonal palette values in the system level variables #30334

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
26 changes: 9 additions & 17 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 @@ -130,13 +130,6 @@

$sys-colors: _generate-sys-colors($ref, $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));

& {
@each $name, $value in $sys-colors {
--#{$prefix}-#{$name}: #{map.get($overrides, $name) or $value};
Expand All @@ -145,14 +138,19 @@
}

@function _generate-sys-colors($ref, $type) {
$palette-colors: definitions.md-ref-palette-values($ref);
@each $name, $value in $palette-colors {
$palette-colors: map.set($palette-colors, $name, map.get($ref, md-ref-palette, $name))
}

$light-sys-colors: definitions.md-sys-color-values-light($ref);
@if ($type == light) {
@return $light-sys-colors;
@return map.merge($palette-colors, $light-sys-colors);
}

$dark-sys-colors: definitions.md-sys-color-values-dark($ref);
@if ($type == dark) {
@return $dark-sys-colors;
@return map.merge($palette-colors, $dark-sys-colors);
}

@if ($type == color-scheme) {
Expand All @@ -162,7 +160,7 @@
$light-dark-sys-colors:
map.set($light-dark-sys-colors, $name, light-dark($light-value, $dark-value));
}
@return $light-dark-sys-colors;
@return map.merge($palette-colors, $light-dark-sys-colors);
}

@error 'Unknown theme-type provided: #{$type}';
Expand Down Expand Up @@ -246,14 +244,8 @@
_create-system-app-vars-map(definitions.md-sys-state-values()),
'md-sys-shape':
_create-system-app-vars-map(definitions.md-sys-shape-values()),
// Add a subset of palette-specific colors used by components instead of system values
'md-ref-palette':
_create-system-app-vars-map(
(
neutral10: '', // Form field native select option text color
neutral-variant20: '', // Sidenav scrim (container background shadow when opened),
)
),
_create-system-app-vars-map(definitions.md-ref-palette-values()),
);

@return sass-utils.deep-merge-all(
Expand Down
Loading