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

Jump to bottom

Palette followup fixes #28676

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Palette followup fixes #28676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d4b793
fix(material/checkbox): derive checkmark color from palette
crisbeto Mar 4, 2024
54b6731
fix(material/chips): derive surface color from palette
crisbeto Mar 4, 2024
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: 14 additions & 12 deletions src/material/core/tokens/m2/mdc/_checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,12 @@
@use '../../../theming/theming';
@use '../../../theming/inspection';
@use '../../../style/sass-utils';
@use '../../../mdc-helpers/mdc-helpers';
@use '../../token-utils';
@use '@material/theme/theme-color' as mdc-theme-color;

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

// MDC logs a warning if the `contrast-tone` function is called with a CSS variable.
// This function falls back to determining the tone based on whether the theme is light or dark.
@function _contrast-tone($value, $is-dark, $light-color: '#fff', $dark-color: '#000') {
@if ($value == 'dark' or $value == 'light' or type-of($value) == 'color') {
@return if(mdc-theme-color.contrast-tone($value) == 'dark', $dark-color, $light-color);
}

@return if($is-dark, $light-color, $dark-color);
}

// Tokens that can't be configured through Angular Material's current theming API,
// but may be in a future version of the theming API.
//
Expand Down Expand Up @@ -62,14 +52,26 @@ $prefix: (mdc, checkbox);
inspection.get-theme-color($theme, foreground, base), $alpha: 0.54);
$active-border-color:
theming.get-color-from-palette(palette.$gray-palette, if($is-dark, 200, 900));
$selected-checkmark-color: null;

// Ideally we would derive all values directly from the theme, but it causes a lot of regressions
// internally. For now we fall back to the old hardcoded behavior only for internal apps.
@if (token-utils.$private-is-internal-build) {
$contrast-tone: mdc-helpers.variable-safe-contrast-tone($palette-selected, $is-dark);
$selected-checkmark-color: if($contrast-tone == 'dark', #000, #fff);
}
@else {
$selected-checkmark-color:
inspection.get-theme-color($theme, $palette-name, default-contrast, 1);
}

@return (
// The color of the checkbox fill when the checkbox is selected and disabled.
disabled-selected-icon-color: $disabled-color,
// The color of the checkbox border when the checkbox is unselected and disabled.
disabled-unselected-icon-color: $disabled-color,
// The color of the checkmark when the checkbox is selected.
selected-checkmark-color: _contrast-tone($palette-selected, $is-dark),
selected-checkmark-color: $selected-checkmark-color,
// The color of the checkbox fill when the checkbox is selected and focused.
selected-focus-icon-color: $palette-selected,
// The color of the checkbox fill when the checkbox is selected and hovered.
Expand Down
12 changes: 3 additions & 9 deletions src/material/core/tokens/m2/mdc/_chip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@use 'sass:map';
@use 'sass:meta';
@use '../../token-utils';
@use '../../../mdc-helpers/mdc-helpers';
@use '../../../style/sass-utils';
@use '../../../theming/theming';
@use '../../../theming/inspection';
Expand Down Expand Up @@ -230,15 +229,10 @@ $prefix: (mdc, chip);
$foreground: if($is-dark, $grey-50, $grey-900);

$surface: inspection.get-theme-color($theme, background, card);
$on-surface: if(
mdc-helpers.variable-safe-contrast-tone($surface, $is-dark) == 'dark',
#000,
#fff
);
$background: if(
meta.type-of($on-surface) == color and meta.type-of($surface) == color,
color.mix($on-surface, $surface, 12%),
$on-surface
meta.type-of($state-layer-color) == color and meta.type-of($surface) == color,
color.mix($state-layer-color, $surface, 12%),
$state-layer-color
);
}
@else {
Expand Down
Loading