|
1 | 1 | @use '@material/theme/theme-color' as mdc-theme-color;
|
2 | 2 | @use '@material/menu-surface' as mdc-menu-surface;
|
3 | 3 | @use '@material/list/evolution-mixins' as mdc-list;
|
4 |
| -@use '@material/select' as mdc-select; |
5 | 4 | @use '@material/typography' as mdc-typography;
|
6 | 5 | @use '../mdc-helpers/mdc-helpers';
|
7 | 6 | @use '../../material/core/typography/typography';
|
|
15 | 14 | @mixin color($config-or-theme) {
|
16 | 15 | $config: theming.get-color-config($config-or-theme);
|
17 | 16 |
|
18 |
| - // Save original values of MDC global variables. We need to save these so we can restore the |
19 |
| - // variables to their original values and prevent unintended side effects from using this mixin. |
20 |
| - $orig-ink-color: mdc-select.$ink-color; |
21 |
| - $orig-label-color: mdc-select.$label-color; |
22 |
| - $orig-disabled-label-color: mdc-select.$disabled-label-color; |
23 |
| - $orig-dropdown-icon-color: mdc-select.$dropdown-icon-color; |
24 |
| - $orig-disabled-dropdown-icon-color: mdc-select.$disabled-dropdown-icon-color; |
25 |
| - |
26 | 17 | @include mdc-helpers.mat-using-mdc-theme($config) {
|
27 |
| - mdc-select.$ink-color: rgba(mdc-theme-color.prop-value(on-surface), 0.87); |
28 |
| - mdc-select.$label-color: rgba(mdc-theme-color.prop-value(on-surface), 0.6); |
29 |
| - mdc-select.$disabled-label-color: rgba(mdc-theme-color.prop-value(on-surface), 0.38); |
30 |
| - mdc-select.$dropdown-icon-color: rgba(mdc-theme-color.prop-value(on-surface), 0.54); |
31 |
| - mdc-select.$disabled-dropdown-icon-color: rgba(mdc-theme-color.prop-value(on-surface), 0.38); |
32 |
| - |
| 18 | + $disabled-color: rgba(mdc-theme-color.prop-value(on-surface), 0.38); |
33 | 19 | @include mdc-menu-surface.core-styles(mdc-helpers.$mat-theme-styles-query);
|
34 | 20 | @include mdc-list.without-ripple(mdc-helpers.$mat-theme-styles-query);
|
35 | 21 |
|
36 | 22 | .mat-mdc-select-value {
|
37 |
| - color: mdc-select.$ink-color; |
| 23 | + color: rgba(mdc-theme-color.prop-value(on-surface), 0.87); |
38 | 24 | }
|
39 | 25 |
|
40 | 26 | .mat-mdc-select-placeholder {
|
41 |
| - color: mdc-select.$label-color; |
| 27 | + color: rgba(mdc-theme-color.prop-value(on-surface), 0.6); |
42 | 28 | }
|
43 | 29 |
|
44 | 30 | .mat-mdc-select-disabled .mat-mdc-select-value {
|
45 |
| - color: mdc-select.$disabled-label-color; |
| 31 | + color: $disabled-color; |
46 | 32 | }
|
47 | 33 |
|
48 | 34 | .mat-mdc-select-arrow {
|
49 |
| - color: mdc-select.$dropdown-icon-color; |
| 35 | + color: rgba(mdc-theme-color.prop-value(on-surface), 0.54); |
50 | 36 | }
|
51 | 37 |
|
52 | 38 | .mat-mdc-form-field {
|
|
69 | 55 | }
|
70 | 56 |
|
71 | 57 | .mat-mdc-select.mat-mdc-select-disabled .mat-mdc-select-arrow {
|
72 |
| - color: mdc-select.$disabled-dropdown-icon-color; |
| 58 | + color: $disabled-color; |
73 | 59 | }
|
74 | 60 | }
|
75 | 61 | }
|
76 |
| - |
77 |
| - // Restore original values of MDC global variables. |
78 |
| - mdc-select.$ink-color: $orig-ink-color; |
79 |
| - mdc-select.$label-color: $orig-label-color; |
80 |
| - mdc-select.$disabled-label-color: $orig-disabled-label-color; |
81 |
| - mdc-select.$dropdown-icon-color: $orig-dropdown-icon-color; |
82 |
| - mdc-select.$disabled-dropdown-icon-color: $orig-disabled-dropdown-icon-color; |
83 | 62 | }
|
84 | 63 |
|
85 | 64 | @mixin typography($config-or-theme) {
|
|
0 commit comments