Skip to content

fix(material/chips): update tokens to system colors #31280

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 2 commits into from
Jun 6, 2025
Merged

fix(material/chips): update tokens to system colors #31280

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411e3be
fix(material/chips): update tokens to system colors
Jun 3, 2025
c1ba332
fix(material/chips): fix lint
Jun 3, 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
29 changes: 6 additions & 23 deletions src/material/chips/_m2-chip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
@use 'sass:map';
@use 'sass:meta';
@use 'sass:color';
@use '../core/theming/inspection';
@use '../core/m2/palette' as m2-palette;
@use '../core/theming/theming';
@use '../core/tokens/m2-utils';
@use '../core/tokens/m3-utils';
Expand Down Expand Up @@ -40,38 +37,24 @@
// Tokens that can be configured through Angular Material's color theming API.
@function get-color-tokens($theme, $color-variant: null) {
$system: m2-utils.get-system($theme);
$foreground: null;
$background: null;
$state-layer-color: inspection.get-theme-color($theme, foreground, base);
$background: m3-utils.color-with-opacity(map.get($system, on-surface), 12%);
$foreground: map.get($system, on-surface);

@if $color-variant == null {
$is-dark: inspection.get-theme-type($theme) == dark;
$grey-50: map.get(m2-palette.$grey-palette, 50);
$grey-900: map.get(m2-palette.$grey-palette, 900);
$foreground: if($is-dark, $grey-50, $grey-900);

$surface: map.get($system, surface);
$background: if(
meta.type-of($state-layer-color) == color and meta.type-of($surface) == color,
color.mix($state-layer-color, $surface, 12%),
$state-layer-color
);
}
@else {
@if $color-variant {
$system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);

$background: map.get($system, primary);
$foreground: map.get($system, on-primary);
}

@return (
chip-disabled-label-text-color: $foreground,
chip-elevated-container-color: $background,
chip-elevated-disabled-container-color: $background,
chip-elevated-selected-container-color: $background,
chip-flat-disabled-selected-container-color: $background,
chip-focus-state-layer-color: $state-layer-color,
chip-focus-state-layer-color: map.get($system, on-surface),
chip-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
chip-hover-state-layer-color: $state-layer-color,
chip-hover-state-layer-color: map.get($system, on-surface),
chip-label-text-color: $foreground,
chip-selected-disabled-trailing-icon-color: $foreground,
chip-selected-focus-state-layer-color: map.get($system, focus-state-layer-opacity),
Expand Down
Loading