Skip to content

fix(material/select): styles for m3 #28492

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.

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 4 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/material-experimental/theming/_custom-tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,8 @@
map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
focused-arrow-color: map.get($systems, md-sys-color, primary),
invalid-arrow-color: map.get($systems, md-sys-color, error),
container-elevation-shadow:
_hardcode(mdc-elevation.elevation-box-shadow(2), $exclude-hardcoded),
)
), (
// Color variants:
Expand Down
5 changes: 4 additions & 1 deletion src/material/core/tokens/m2/mat/_select.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
@use '../../token-utils';
@use '../../../theming/inspection';
@use '../../../style/sass-utils';
@use '@material/elevation/elevation-theme' as mdc-elevation;

// The prefix used to generate the fully qualified name for tokens in this file.
$prefix: (mat, select);

// Tokens that can't be configured through Angular Material's current theming API,
// but may be in a future version of the theming API.
@function get-unthemable-tokens() {
@return ();
@return (
container-elevation-shadow: mdc-elevation.elevation-box-shadow(8),
);
}

// Tokens that can be configured through Angular Material's color theming API.
Expand Down
7 changes: 6 additions & 1 deletion src/material/select/_select-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
@if inspection.get-theme-version($theme) == 1 {
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
}
@else {}
@else {
@include sass-utils.current-selector-or-root() {
$mat-tokens: tokens-mat-select.get-unthemable-tokens();
@include token-utils.create-token-values(tokens-mat-select.$prefix, $mat-tokens);
}
}
}

/// Outputs color theme styles for the mat-select.
Expand Down
22 changes: 16 additions & 6 deletions src/material/select/select.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use 'sass:math';
@use '@angular/cdk';
@use '@material/typography/typography' as mdc-typography;
@use '../core/style/elevation';
@use '../core/style/vendor-prefixes';
@use '../core/style/variables';
@use '../core/tokens/token-utils';
Expand Down Expand Up @@ -32,6 +31,11 @@ $scale: 0.75 !default;
@include token-utils.create-token-slot(letter-spacing, trigger-text-tracking);
}
}
@include token-utils.use-tokens(tokens-mat-select.$prefix, tokens-mat-select.get-token-slots()) {
div.mat-mdc-select-panel {
@include token-utils.create-token-slot(box-shadow, container-elevation-shadow);
}
}

.mat-mdc-select-disabled {
@include token-utils.use-tokens(
Expand Down Expand Up @@ -83,6 +87,13 @@ $scale: 0.75 !default;
}
}

.mat-mdc-form-field .mat-mdc-select.mat-mdc-select-invalid .mat-mdc-select-arrow,
.mat-form-field-invalid:not(.mat-form-field-disabled) .mat-mdc-form-field-infix::after {
@include token-utils.use-tokens(tokens-mat-select.$prefix, tokens-mat-select.get-token-slots()) {
@include token-utils.create-token-slot(color, invalid-arrow-color);
}
}

.mat-mdc-select-arrow {
width: $mat-select-arrow-size * 2;
height: $mat-select-arrow-size;
Expand All @@ -96,10 +107,6 @@ $scale: 0.75 !default;
@include token-utils.create-token-slot(color, focused-arrow-color);
}

.mat-mdc-form-field .mat-mdc-select.mat-mdc-select-invalid & {
@include token-utils.create-token-slot(color, invalid-arrow-color);
}

.mat-mdc-form-field .mat-mdc-select.mat-mdc-select-disabled & {
@include token-utils.create-token-slot(color, disabled-arrow-color);
}
Expand Down Expand Up @@ -128,7 +135,6 @@ $scale: 0.75 !default;
// DOM for the Gmat versions to work. We need to bump up the specificity here
// so that it's higher than MDC's styles.
div.mat-mdc-select-panel {
@include elevation.elevation(8);
width: 100%; // Ensures that the panel matches the overlay width.
max-height: $mat-select-panel-max-height;
outline: 0;
Expand Down Expand Up @@ -160,6 +166,10 @@ div.mat-mdc-select-panel {
border-bottom-right-radius: 0;
transform-origin: bottom center;
}

.mat-mdc-option {
--mdc-list-list-item-container-color: var(--mat-select-panel-background-color);
}
}

.mat-mdc-select-placeholder {
Expand Down