Skip to content

fix(material/core): allow extra color palette slots in theme validation #30821

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

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

fix(material/core): allow extra color palette slots in theme validation #30821

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
34 changes: 25 additions & 9 deletions src/material/core/theming/_config-validation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@use 'sass:meta';
@use 'sass:string';
@use '../style/validation';
@use './palettes';

/// Creates an error message by finding `$config` in the existing message and appending a suffix to
/// it.
Expand Down Expand Up @@ -33,18 +32,35 @@
@if not meta.type-of($palette) == 'map' {
@return true;
}
$keys: map.keys($palette);
$expected-keys: map.keys(palettes.$red-palette);
@if validation.validate-allowed-values($keys, $expected-keys...) or
validation.validate-required-values($keys, $expected-keys...) {

// check for supporting palettes
$expected-palette-keys: (secondary, neutral, neutral-variant, error);
$primary-keys: map.keys($palette);
@if validation.validate-required-values($primary-keys, $expected-palette-keys...) {
@return true;
}
$nv-keys: map.keys(map.get($palette, neutral-variant));
$expected-nv-keys: map.keys(map.get(palettes.$red-palette, neutral-variant));
@if validation.validate-allowed-values($nv-keys, $expected-nv-keys...) or
validation.validate-required-values($nv-keys, $expected-nv-keys...) {

$expected-color-slot-keys: (0, 10, 20, 25, 30, 35, 40, 50, 60, 70, 80, 90, 95, 98, 99, 100);
$additional-neutral-keys: (4, 6, 12, 17, 22, 24, 87, 92, 94, 96);
$expected-neutral-keys: list.join($expected-color-slot-keys, $additional-neutral-keys);

// check primary color palette slots
@if validation.validate-required-values($primary-keys, $expected-color-slot-keys...) {
@return true;
}

// check remaining palette color slots
@each $color-palette in $expected-palette-keys {
$keys: map.keys(map.get($palette, $color-palette));
@if $color-palette == neutral and
validation.validate-required-values($keys, $expected-neutral-keys...) {
@return true;
}
@else if validation.validate-required-values($keys, $expected-color-slot-keys...) {
@return true;
}
}

@return null;
}

Expand Down
Loading