Skip to content

Commit 8f16c18

Browse files
author
Andrew Seguin
committed
fix(material/autocomplete): define m2 token values inline
1 parent 89d9cd0 commit 8f16c18

File tree

2 files changed

+27
-21
lines changed

2 files changed

+27
-21
lines changed

src/material/autocomplete/_autocomplete-theme.scss

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,39 @@
88
@use 'm3-autocomplete';
99

1010
@mixin base($theme) {
11+
$tokens: m2-autocomplete.get-unthemable-tokens();
1112
@if inspection.get-theme-version($theme) == 1 {
12-
@include token-utils.create-token-values(map.get(m3-autocomplete.get-tokens($theme), base));
13-
} @else {
14-
@include sass-utils.current-selector-or-root() {
15-
@include token-utils.create-token-values-mixed(m2-autocomplete.get-unthemable-tokens());
16-
}
13+
$tokens: map.get(m3-autocomplete.get-tokens($theme), base);
1714
}
15+
16+
@include token-utils.values($tokens);
1817
}
1918

2019
@mixin color($theme) {
20+
$tokens: m2-autocomplete.get-color-tokens($theme);
2121
@if inspection.get-theme-version($theme) == 1 {
22-
@include token-utils.create-token-values(map.get(m3-autocomplete.get-tokens($theme), color));
23-
} @else {
24-
@include sass-utils.current-selector-or-root() {
25-
@include token-utils.create-token-values-mixed(m2-autocomplete.get-color-tokens($theme));
26-
}
22+
$tokens: map.get(m3-autocomplete.get-tokens($theme), color);
2723
}
24+
25+
@include token-utils.values($tokens);
2826
}
2927

3028
@mixin typography($theme) {
29+
$tokens: m2-autocomplete.get-typography-tokens($theme);
3130
@if inspection.get-theme-version($theme) == 1 {
32-
@include token-utils.create-token-values(
33-
map.get(m3-autocomplete.get-tokens($theme), typography));
34-
} @else {
35-
@include sass-utils.current-selector-or-root() {
36-
@include token-utils.create-token-values-mixed(m2-autocomplete.get-typography-tokens($theme));
37-
}
31+
$tokens: map.get(m3-autocomplete.get-tokens($theme), typography);
3832
}
33+
34+
@include token-utils.values($tokens);
3935
}
4036

4137
@mixin density($theme) {
38+
$tokens: m2-autocomplete.get-density-tokens($theme);
4239
@if inspection.get-theme-version($theme) == 1 {
43-
@include token-utils.create-token-values(map.get(m3-autocomplete.get-tokens($theme), density));
44-
} @else {
45-
@include sass-utils.current-selector-or-root() {
46-
@include token-utils.create-token-values-mixed(m2-autocomplete.get-density-tokens($theme));
47-
}
40+
$tokens: map.get(m3-autocomplete.get-tokens($theme), density);
4841
}
42+
43+
@include token-utils.values($tokens);
4944
}
5045

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

src/material/core/tokens/_token-utils.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@
6969
@return _create-var(--mat-#{$token}, $sys-fallback);
7070
}
7171

72+
// Outputs a map of token values as CSS variable definitions.
73+
@mixin values($tokens) {
74+
@include sass-utils.current-selector-or-root() {
75+
@each $key, $value in $tokens {
76+
@if $value != null {
77+
--mat-#{$key}: #{$value};
78+
}
79+
}
80+
}
81+
}
82+
7283
// Outputs a map of tokens.
7384
@mixin create-token-values($tokens) {
7485
@include _create-token-values-internal($tokens, false);

0 commit comments

Comments
 (0)