Skip to content

fix(material/progress-spinner): Move unthemable tokens to theme mixin #27567

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
Aug 4, 2023
Merged

fix(material/progress-spinner): Move unthemable tokens to theme mixin #27567

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/material/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
progress-bar-theme, progress-bar-color, progress-bar-typography, progress-bar-density;
@forward './progress-spinner/progress-spinner-theme' as progress-spinner-* show
progress-spinner-theme, progress-spinner-color, progress-spinner-typography,
progress-spinner-density;
progress-spinner-density, progress-spinner-base;
@forward './legacy-progress-spinner/progress-spinner-theme' as legacy-progress-spinner-* show
legacy-progress-spinner-theme, legacy-progress-spinner-color, legacy-progress-spinner-typography;
@forward './radio/radio-theme' as radio-* show radio-theme, radio-color, radio-typography,
Expand Down
11 changes: 11 additions & 0 deletions src/material/progress-spinner/_progress-spinner-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
@use 'sass:map';
@use '../core/style/sass-utils';
@use '../core/theming/theming';
@use '../core/tokens/m2/mdc/circular-progress' as tokens-mdc-circular-progress;
@use '@material/circular-progress/circular-progress-theme' as mdc-circular-progress-theme;

@mixin base($config-or-theme) {
// Add default values for tokens not related to color, typography, or density.
@include sass-utils.current-selector-or-root() {
@include mdc-circular-progress-theme.theme(
tokens-mdc-circular-progress.get-unthemable-tokens()
);
}
}

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
$mdc-circular-progress-color-tokens: tokens-mdc-circular-progress.get-color-tokens($config);
Expand Down Expand Up @@ -33,6 +43,7 @@
$density: theming.get-density-config($theme);
$typography: theming.get-typography-config($theme);

@include base($theme);
@if $color != null {
@include color($color);
}
Expand Down
3 changes: 0 additions & 3 deletions src/material/progress-spinner/progress-spinner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
.mat-mdc-progress-spinner {
// Add the official slots for the MDC circular progress.
@include mdc-circular-progress-theme.theme-styles($mdc-circular-progress-token-slots);

// Add default values for tokens that aren't outputted by the theming API.
@include mdc-circular-progress-theme.theme(m2-mdc-circular-progress.get-unthemable-tokens());
}
}

Expand Down