Skip to content

fix(material/chips): sync with g3 #31393

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
Jun 21, 2025
Merged

fix(material/chips): sync with g3 #31393

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
27 changes: 15 additions & 12 deletions src/material/chips/_chips-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
/// for the mat-chips.
/// @param {Map} $theme The theme to generate base styles for.
@mixin base($theme) {
$tokens: m2-chip.get-unthemable-tokens($theme);
@if inspection.get-theme-version($theme) == 1 {
$tokens: map.get(m3-chip.get-tokens($theme), base);
@include token-utils.values(map.get(m3-chip.get-tokens($theme), base));
} @else {
.mat-mdc-standard-chip {
@include token-utils.values(m2-chip.get-unthemable-tokens($theme));
}
}

@include token-utils.values($tokens);
}

/// Outputs color theme styles for the mat-chips.
Expand Down Expand Up @@ -50,23 +51,25 @@
/// Outputs typography theme styles for the mat-chips.
/// @param {Map} $theme The theme to generate typography styles for.
@mixin typography($theme) {
$tokens: m2-chip.get-typography-tokens($theme);
@if inspection.get-theme-version($theme) == 1 {
$tokens: map.get(m3-chip.get-tokens($theme), typography);
@include token-utils.values(map.get(m3-chip.get-tokens($theme), typography));
} @else {
.mat-mdc-standard-chip {
@include token-utils.values(m2-chip.get-typography-tokens($theme));
}
}

@include token-utils.values($tokens);
}

/// Outputs density theme styles for the mat-chips.
/// @param {Map} $theme The theme to generate density styles for.
@mixin density($theme) {
$tokens: m2-chip.get-density-tokens($theme);
@if inspection.get-theme-version($theme) == 1 {
$tokens: map.get(m3-chip.get-tokens($theme), density);
@include token-utils.values(map.get(m3-chip.get-tokens($theme), density));
} @else {
.mat-mdc-chip.mat-mdc-standard-chip {
@include token-utils.values(m2-chip.get-density-tokens($theme));
}
}

@include token-utils.values($tokens);
}

/// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
Expand Down
Loading