@angular/material 20.1.0-next.1 → 20.1.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_index.scss +1 -2
- package/autocomplete/_autocomplete-theme.scss +28 -37
- package/autocomplete/_m2-autocomplete.scss +10 -22
- package/badge/_badge-theme.scss +35 -44
- package/badge/_m2-badge.scss +46 -59
- package/bottom-sheet/_bottom-sheet-theme.scss +28 -40
- package/bottom-sheet/_m2-bottom-sheet.scss +16 -33
- package/button/_button-theme.scss +37 -55
- package/button/_fab-theme.scss +42 -56
- package/button/_icon-button-theme.scss +33 -49
- package/button/_m2-button.scss +135 -158
- package/button/_m2-fab.scss +60 -69
- package/button/_m2-icon-button.scss +30 -50
- package/button/_m3-button.scss +1 -2
- package/button/_m3-fab.scss +1 -2
- package/button/_m3-icon-button.scss +1 -2
- package/button/testing/index.d.ts +1 -0
- package/button-toggle/_button-toggle-theme.scss +29 -44
- package/button-toggle/_m2-button-toggle.scss +58 -81
- package/button-toggle/_m3-button-toggle.scss +1 -2
- package/card/_card-theme.scss +28 -36
- package/card/_m2-card.scss +30 -45
- package/checkbox/_checkbox-theme.scss +37 -50
- package/checkbox/_m2-checkbox.scss +30 -40
- package/checkbox/_m3-checkbox.scss +1 -2
- package/chips/_chips-theme.scss +27 -30
- package/chips/_m2-chip.scss +40 -53
- package/chips/_m3-chip.scss +1 -2
- package/core/_core-theme.scss +48 -67
- package/core/_m2-app.scss +11 -23
- package/core/focus-indicators/_private.scss +2 -5
- package/core/m2/_theming.scss +36 -41
- package/core/option/_m2-optgroup.scss +13 -25
- package/core/option/_m2-option.scss +16 -22
- package/core/option/_optgroup-theme.scss +28 -30
- package/core/option/_option-theme.scss +35 -34
- package/core/ripple/_m2-ripple.scss +8 -20
- package/core/ripple/_ripple-theme.scss +28 -33
- package/core/selection/pseudo-checkbox/_m2-pseudo-checkbox.scss +14 -21
- package/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss +55 -45
- package/core/theming/_all-theme.scss +38 -42
- package/core/theming/_definition.scss +22 -13
- package/core/theming/_inspection.scss +0 -12
- package/core/theming/_m2-inspection.scss +0 -33
- package/core/theming/_theming.scss +4 -172
- package/core/tokens/_m2-utils.scss +16 -68
- package/core/tokens/_m3-utils.scss +2 -14
- package/core/tokens/_token-utils.scss +7 -27
- package/core/tokens/m2/_index.scss +6 -0
- package/core/tokens/m2/_md-sys-color.scss +123 -0
- package/core/tokens/m2/_md-sys-elevation.scss +16 -0
- package/core/tokens/m2/_md-sys-motion.scss +36 -0
- package/core/tokens/m2/_md-sys-shape.scss +22 -0
- package/core/tokens/m2/_md-sys-state.scss +15 -0
- package/core/tokens/m2/_md-sys-typescale.scss +68 -0
- package/core/tokens/m3/_md-sys-color.scss +2 -2
- package/core/tokens/m3/_md-sys-typescale.scss +1 -1
- package/core/tokens/m3/_theme.scss +14 -26
- package/datepicker/_datepicker-theme.scss +38 -40
- package/datepicker/_m2-datepicker.scss +26 -40
- package/dialog/_dialog-theme.scss +28 -34
- package/dialog/_m2-dialog.scss +34 -48
- package/divider/_divider-theme.scss +28 -30
- package/divider/_m2-divider.scss +10 -21
- package/expansion/_expansion-theme.scss +28 -39
- package/expansion/_m2-expansion.scss +52 -67
- package/expansion/_m3-expansion.scss +3 -2
- package/fesm2022/autocomplete.mjs +1 -1
- package/fesm2022/button/testing.mjs +7 -4
- package/fesm2022/button/testing.mjs.map +1 -1
- package/fesm2022/chips.mjs +1 -1
- package/fesm2022/core.mjs +1 -1
- package/fesm2022/core.mjs.map +1 -1
- package/fesm2022/datepicker.mjs +1 -1
- package/fesm2022/expansion.mjs +2 -2
- package/fesm2022/expansion.mjs.map +1 -1
- package/fesm2022/{form-field-C9DZXojn.mjs → form-field-CFbrnFED.mjs} +3 -3
- package/fesm2022/{form-field-C9DZXojn.mjs.map → form-field-CFbrnFED.mjs.map} +1 -1
- package/fesm2022/form-field.mjs +2 -2
- package/fesm2022/input.mjs +3 -27
- package/fesm2022/input.mjs.map +1 -1
- package/fesm2022/menu/testing.mjs +97 -13
- package/fesm2022/menu/testing.mjs.map +1 -1
- package/fesm2022/menu.mjs +343 -122
- package/fesm2022/menu.mjs.map +1 -1
- package/fesm2022/{module-BDiw_nWS.mjs → module-B0CLRw5e.mjs} +3 -3
- package/fesm2022/{module-BDiw_nWS.mjs.map → module-B0CLRw5e.mjs.map} +1 -1
- package/fesm2022/{module-DzZHEh7B.mjs → module-B62K-792.mjs} +2 -2
- package/fesm2022/{module-DzZHEh7B.mjs.map → module-B62K-792.mjs.map} +1 -1
- package/fesm2022/paginator.mjs +3 -3
- package/fesm2022/select.mjs +3 -3
- package/fesm2022/sidenav.mjs +2 -4
- package/fesm2022/sidenav.mjs.map +1 -1
- package/fesm2022/slide-toggle.mjs +2 -2
- package/fesm2022/slide-toggle.mjs.map +1 -1
- package/fesm2022/snack-bar.mjs +2 -2
- package/fesm2022/timepicker.mjs +1 -1
- package/form-field/_form-field-theme.scss +35 -51
- package/form-field/_m2-form-field.scss +125 -146
- package/form-field/_m3-form-field.scss +1 -2
- package/grid-list/_grid-list-theme.scss +28 -28
- package/grid-list/_m2-grid-list.scss +16 -29
- package/icon/_icon-theme.scss +40 -41
- package/icon/_m2-icon.scss +7 -21
- package/input/_input-theme.scss +1 -4
- package/input/index.d.ts +0 -11
- package/list/_list-theme.scss +57 -53
- package/list/_m2-list.scss +84 -108
- package/list/_m3-list.scss +1 -2
- package/menu/_m2-menu.scss +33 -46
- package/menu/_menu-theme.scss +28 -33
- package/menu/index.d.ts +145 -61
- package/menu/testing/index.d.ts +50 -2
- package/package.json +2 -2
- package/paginator/_m2-paginator.scss +38 -58
- package/paginator/_m3-paginator.scss +1 -2
- package/paginator/_paginator-theme.scss +28 -33
- package/prebuilt-themes/deeppurple-amber.css +1 -1
- package/prebuilt-themes/indigo-pink.css +1 -1
- package/prebuilt-themes/pink-bluegrey.css +1 -1
- package/prebuilt-themes/purple-green.css +1 -1
- package/progress-bar/_m2-progress-bar.scss +11 -24
- package/progress-bar/_progress-bar-theme.scss +35 -43
- package/progress-spinner/_m2-progress-spinner.scss +9 -20
- package/progress-spinner/_progress-spinner-theme.scss +42 -43
- package/radio/_m2-radio.scss +30 -40
- package/radio/_m3-radio.scss +1 -2
- package/radio/_radio-theme.scss +33 -46
- package/schematics/ng-add/index.js +1 -1
- package/schematics/ng-generate/theme-color/schema.json +1 -1
- package/select/_m2-select.scss +23 -30
- package/select/_m3-select.scss +1 -2
- package/select/_select-theme.scss +38 -51
- package/sidenav/_m2-sidenav.scss +26 -36
- package/sidenav/_sidenav-theme.scss +28 -30
- package/slide-toggle/_m2-slide-toggle.scss +111 -143
- package/slide-toggle/_m3-slide-toggle.scss +1 -0
- package/slide-toggle/_slide-toggle-theme.scss +42 -80
- package/slider/_m2-slider.scss +34 -55
- package/slider/_slider-theme.scss +38 -45
- package/snack-bar/_m2-snack-bar.scss +16 -36
- package/snack-bar/_snack-bar-theme.scss +28 -31
- package/sort/_m2-sort.scss +7 -18
- package/sort/_sort-theme.scss +28 -33
- package/stepper/_m2-stepper.scss +39 -57
- package/stepper/_m3-stepper.scss +1 -2
- package/stepper/_stepper-theme.scss +41 -49
- package/table/_m2-table.scss +54 -72
- package/table/_m3-table.scss +1 -2
- package/table/_table-theme.scss +28 -36
- package/tabs/_m2-tabs.scss +31 -46
- package/tabs/_m3-tabs.scss +1 -2
- package/tabs/_tabs-theme.scss +41 -49
- package/timepicker/_m2-timepicker.scss +10 -22
- package/timepicker/_timepicker-theme.scss +28 -46
- package/toolbar/_m2-toolbar.scss +26 -46
- package/toolbar/_m3-toolbar.scss +1 -2
- package/toolbar/_toolbar-theme.scss +55 -46
- package/tooltip/_m2-tooltip.scss +16 -34
- package/tooltip/_tooltip-theme.scss +28 -37
- package/tree/_m2-tree.scss +21 -38
- package/tree/_m3-tree.scss +1 -2
- package/tree/_tree-theme.scss +28 -38
- package/core/tokens/_format-tokens.scss +0 -5
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
@use '../core/style/sass-utils';
|
|
2
1
|
@use '../core/theming/inspection';
|
|
3
|
-
@use '../core/theming/theming';
|
|
4
2
|
@use '../core/tokens/token-utils';
|
|
5
3
|
@use '../core/typography/typography';
|
|
6
4
|
@use './m2-select';
|
|
@@ -11,63 +9,54 @@
|
|
|
11
9
|
/// for the mat-select.
|
|
12
10
|
/// @param {Map} $theme The theme to generate base styles for.
|
|
13
11
|
@mixin base($theme) {
|
|
12
|
+
$tokens: map.get(m2-select.get-tokens($theme), base);
|
|
14
13
|
@if inspection.get-theme-version($theme) == 1 {
|
|
15
|
-
|
|
16
|
-
} @else {
|
|
17
|
-
@include sass-utils.current-selector-or-root() {
|
|
18
|
-
$mat-tokens: m2-select.get-unthemable-tokens();
|
|
19
|
-
@include token-utils.create-token-values-mixed($mat-tokens);
|
|
20
|
-
}
|
|
14
|
+
$tokens: map.get(m3-select.get-tokens($theme), base);
|
|
21
15
|
}
|
|
16
|
+
|
|
17
|
+
@include token-utils.values($tokens);
|
|
22
18
|
}
|
|
23
19
|
|
|
24
20
|
/// Outputs color theme styles for the mat-select.
|
|
25
21
|
/// @param {Map} $theme The theme to generate color styles for.
|
|
26
22
|
/// @param {String} $color-variant The color variant to use for the component (M3 only)
|
|
27
23
|
@mixin color($theme, $color-variant: null) {
|
|
24
|
+
$tokens: map.get(m2-select.get-tokens($theme), color);
|
|
28
25
|
@if inspection.get-theme-version($theme) == 1 {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
} @else {
|
|
32
|
-
@include sass-utils.current-selector-or-root() {
|
|
33
|
-
@include token-utils.create-token-values-mixed(
|
|
34
|
-
m2-select.get-color-tokens($theme, primary));
|
|
26
|
+
$tokens: map.get(m3-select.get-tokens($theme, $color-variant), color);
|
|
27
|
+
}
|
|
35
28
|
|
|
36
|
-
|
|
37
|
-
@include token-utils.create-token-values-mixed(
|
|
38
|
-
m2-select.get-color-tokens($theme, secondary));
|
|
39
|
-
}
|
|
29
|
+
@include token-utils.values($tokens);
|
|
40
30
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
31
|
+
@if inspection.get-theme-version($theme) != 1 {
|
|
32
|
+
.mat-mdc-form-field.mat-accent {
|
|
33
|
+
$tokens: m2-select.private-get-color-palette-color-tokens($theme, secondary);
|
|
34
|
+
@include token-utils.values($tokens);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
.mat-mdc-form-field.mat-warn {
|
|
38
|
+
$tokens: m2-select.private-get-color-palette-color-tokens($theme, error);
|
|
39
|
+
@include token-utils.values($tokens);
|
|
45
40
|
}
|
|
46
41
|
}
|
|
47
42
|
}
|
|
48
43
|
|
|
49
|
-
/// Outputs typography theme styles for the mat-select.
|
|
50
|
-
/// @param {Map} $theme The theme to generate typography styles for.
|
|
51
44
|
@mixin typography($theme) {
|
|
45
|
+
$tokens: map.get(m2-select.get-tokens($theme), typography);
|
|
52
46
|
@if inspection.get-theme-version($theme) == 1 {
|
|
53
|
-
|
|
54
|
-
} @else {
|
|
55
|
-
@include sass-utils.current-selector-or-root() {
|
|
56
|
-
@include token-utils.create-token-values-mixed(m2-select.get-typography-tokens($theme));
|
|
57
|
-
}
|
|
47
|
+
$tokens: map.get(m3-select.get-tokens($theme), typography);
|
|
58
48
|
}
|
|
49
|
+
|
|
50
|
+
@include token-utils.values($tokens);
|
|
59
51
|
}
|
|
60
52
|
|
|
61
|
-
/// Outputs typography theme styles for the mat-select.
|
|
62
|
-
/// @param {Map} $theme The theme to generate density styles for.
|
|
63
53
|
@mixin density($theme) {
|
|
54
|
+
$tokens: map.get(m2-select.get-tokens($theme), density);
|
|
64
55
|
@if inspection.get-theme-version($theme) == 1 {
|
|
65
|
-
|
|
66
|
-
} @else {
|
|
67
|
-
@include sass-utils.current-selector-or-root() {
|
|
68
|
-
@include token-utils.create-token-values-mixed(m2-select.get-density-tokens($theme));
|
|
69
|
-
}
|
|
56
|
+
$tokens: map.get(m3-select.get-tokens($theme), density);
|
|
70
57
|
}
|
|
58
|
+
|
|
59
|
+
@include token-utils.values($tokens);
|
|
71
60
|
}
|
|
72
61
|
|
|
73
62
|
/// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
|
|
@@ -90,23 +79,21 @@
|
|
|
90
79
|
/// @param {Map} $theme The theme to generate styles for.
|
|
91
80
|
/// @param {String} $color-variant The color variant to use for the component (M3 only)
|
|
92
81
|
@mixin theme($theme, $color-variant: null) {
|
|
93
|
-
@
|
|
94
|
-
@
|
|
95
|
-
|
|
96
|
-
|
|
82
|
+
@if inspection.get-theme-version($theme) == 1 {
|
|
83
|
+
@include base($theme);
|
|
84
|
+
@include color($theme, $color-variant);
|
|
85
|
+
@include density($theme);
|
|
86
|
+
@include typography($theme);
|
|
87
|
+
} @else {
|
|
88
|
+
@include base($theme);
|
|
89
|
+
@if inspection.theme-has($theme, color) {
|
|
90
|
+
@include color($theme);
|
|
91
|
+
}
|
|
92
|
+
@if inspection.theme-has($theme, density) {
|
|
97
93
|
@include density($theme);
|
|
94
|
+
}
|
|
95
|
+
@if inspection.theme-has($theme, typography) {
|
|
98
96
|
@include typography($theme);
|
|
99
|
-
} @else {
|
|
100
|
-
@include base($theme);
|
|
101
|
-
@if inspection.theme-has($theme, color) {
|
|
102
|
-
@include color($theme);
|
|
103
|
-
}
|
|
104
|
-
@if inspection.theme-has($theme, density) {
|
|
105
|
-
@include density($theme);
|
|
106
|
-
}
|
|
107
|
-
@if inspection.theme-has($theme, typography) {
|
|
108
|
-
@include typography($theme);
|
|
109
|
-
}
|
|
110
97
|
}
|
|
111
98
|
}
|
|
112
99
|
}
|
package/sidenav/_m2-sidenav.scss
CHANGED
|
@@ -6,48 +6,38 @@
|
|
|
6
6
|
@use '../core/tokens/m2-utils';
|
|
7
7
|
@use '../core/tokens/m3-utils';
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
// but may be in a future version of the theming API.
|
|
11
|
-
@function get-unthemable-tokens() {
|
|
12
|
-
@return (
|
|
13
|
-
// Currently zero, but it appears to be relevant for M3.
|
|
14
|
-
// See: https://m3.material.io/components/navigation-drawer/overview
|
|
15
|
-
sidenav-container-shape: 0,
|
|
16
|
-
sidenav-container-elevation-shadow: elevation.get-box-shadow(16),
|
|
17
|
-
sidenav-container-width: auto,
|
|
18
|
-
);
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
// Tokens that can be configured through Angular Material's color theming API.
|
|
22
|
-
@function get-color-tokens($theme) {
|
|
9
|
+
@function get-tokens($theme) {
|
|
23
10
|
$system: m2-utils.get-system($theme);
|
|
24
|
-
|
|
11
|
+
// TODO: Use system colors instead of checking theme type
|
|
12
|
+
$is-dark: false;
|
|
13
|
+
@if (meta.type-of($theme) == map and map.get($theme, color)) {
|
|
14
|
+
$is-dark: inspection.get-theme-type($theme) == dark;
|
|
15
|
+
}
|
|
25
16
|
$scrim-opacity: 0.6;
|
|
26
17
|
$scrim-color: m3-utils.color-with-opacity(map.get($system, surface), 60%);
|
|
27
18
|
$fallback-scrim-color: if($is-dark, rgba(#fff, $scrim-opacity), rgba(#000, $scrim-opacity));
|
|
28
19
|
|
|
29
20
|
@return (
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
21
|
+
base: (
|
|
22
|
+
sidenav-container-shape: 0,
|
|
23
|
+
sidenav-container-elevation-shadow: elevation.get-box-shadow(16),
|
|
24
|
+
sidenav-container-width: auto,
|
|
25
|
+
),
|
|
26
|
+
color: (
|
|
27
|
+
sidenav-container-divider-color: map.get($system, outline),
|
|
28
|
+
sidenav-container-background-color: map.get($system, surface),
|
|
29
|
+
sidenav-container-text-color: map.get($system, on-surface),
|
|
30
|
+
sidenav-content-background-color: map.get($system, background),
|
|
31
|
+
sidenav-content-text-color: map.get($system, on-surface),
|
|
35
32
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
33
|
+
// We use invert() here to have the darken the background color expected to be used.
|
|
34
|
+
// If the background is light, we use a dark backdrop. If the background is dark, we
|
|
35
|
+
// use a light backdrop. If the value isn't a color, Sass will throw an error so we
|
|
36
|
+
// fall back to something generic.
|
|
37
|
+
sidenav-scrim-color: if(meta.type-of($scrim-color) == color,
|
|
38
|
+
color.invert($scrim-color), $fallback-scrim-color),
|
|
39
|
+
),
|
|
40
|
+
typography: (),
|
|
41
|
+
density: (),
|
|
42
42
|
);
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
// Tokens that can be configured through Angular Material's typography theming API.
|
|
46
|
-
@function get-typography-tokens($theme) {
|
|
47
|
-
@return ();
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
// Tokens that can be configured through Angular Material's density theming API.
|
|
51
|
-
@function get-density-tokens($theme) {
|
|
52
|
-
@return ();
|
|
53
|
-
}
|
|
@@ -1,43 +1,43 @@
|
|
|
1
1
|
@use 'sass:map';
|
|
2
|
-
@use '../core/style/sass-utils';
|
|
3
2
|
@use '../core/theming/inspection';
|
|
4
|
-
@use '../core/theming/theming';
|
|
5
3
|
@use '../core/tokens/token-utils';
|
|
6
4
|
@use './m2-sidenav';
|
|
7
5
|
@use './m3-sidenav';
|
|
8
6
|
|
|
9
7
|
@mixin base($theme) {
|
|
8
|
+
$tokens: map.get(m2-sidenav.get-tokens($theme), base);
|
|
10
9
|
@if inspection.get-theme-version($theme) == 1 {
|
|
11
|
-
|
|
12
|
-
} @else {
|
|
13
|
-
@include sass-utils.current-selector-or-root() {
|
|
14
|
-
@include token-utils.create-token-values-mixed(m2-sidenav.get-unthemable-tokens());
|
|
15
|
-
}
|
|
10
|
+
$tokens: map.get(m3-sidenav.get-tokens($theme), base);
|
|
16
11
|
}
|
|
12
|
+
|
|
13
|
+
@include token-utils.values($tokens);
|
|
17
14
|
}
|
|
18
15
|
|
|
19
16
|
@mixin color($theme) {
|
|
17
|
+
$tokens: map.get(m2-sidenav.get-tokens($theme), color);
|
|
20
18
|
@if inspection.get-theme-version($theme) == 1 {
|
|
21
|
-
|
|
22
|
-
} @else {
|
|
23
|
-
@include sass-utils.current-selector-or-root() {
|
|
24
|
-
@include token-utils.create-token-values-mixed(m2-sidenav.get-color-tokens($theme));
|
|
25
|
-
}
|
|
19
|
+
$tokens: map.get(m3-sidenav.get-tokens($theme), color);
|
|
26
20
|
}
|
|
21
|
+
|
|
22
|
+
@include token-utils.values($tokens);
|
|
27
23
|
}
|
|
28
24
|
|
|
29
25
|
@mixin typography($theme) {
|
|
26
|
+
$tokens: map.get(m2-sidenav.get-tokens($theme), typography);
|
|
30
27
|
@if inspection.get-theme-version($theme) == 1 {
|
|
31
|
-
|
|
32
|
-
} @else {
|
|
28
|
+
$tokens: map.get(m3-sidenav.get-tokens($theme), typography);
|
|
33
29
|
}
|
|
30
|
+
|
|
31
|
+
@include token-utils.values($tokens);
|
|
34
32
|
}
|
|
35
33
|
|
|
36
34
|
@mixin density($theme) {
|
|
35
|
+
$tokens: map.get(m2-sidenav.get-tokens($theme), density);
|
|
37
36
|
@if inspection.get-theme-version($theme) == 1 {
|
|
38
|
-
|
|
39
|
-
} @else {
|
|
37
|
+
$tokens: map.get(m3-sidenav.get-tokens($theme), density);
|
|
40
38
|
}
|
|
39
|
+
|
|
40
|
+
@include token-utils.values($tokens);
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
/// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
|
|
@@ -55,23 +55,21 @@
|
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
@mixin theme($theme) {
|
|
58
|
-
@
|
|
59
|
-
@
|
|
60
|
-
|
|
58
|
+
@if inspection.get-theme-version($theme) == 1 {
|
|
59
|
+
@include base($theme);
|
|
60
|
+
@include color($theme);
|
|
61
|
+
@include density($theme);
|
|
62
|
+
@include typography($theme);
|
|
63
|
+
} @else {
|
|
64
|
+
@include base($theme);
|
|
65
|
+
@if inspection.theme-has($theme, color) {
|
|
61
66
|
@include color($theme);
|
|
67
|
+
}
|
|
68
|
+
@if inspection.theme-has($theme, density) {
|
|
62
69
|
@include density($theme);
|
|
70
|
+
}
|
|
71
|
+
@if inspection.theme-has($theme, typography) {
|
|
63
72
|
@include typography($theme);
|
|
64
|
-
} @else {
|
|
65
|
-
@include base($theme);
|
|
66
|
-
@if inspection.theme-has($theme, color) {
|
|
67
|
-
@include color($theme);
|
|
68
|
-
}
|
|
69
|
-
@if inspection.theme-has($theme, density) {
|
|
70
|
-
@include density($theme);
|
|
71
|
-
}
|
|
72
|
-
@if inspection.theme-has($theme, typography) {
|
|
73
|
-
@include typography($theme);
|
|
74
|
-
}
|
|
75
73
|
}
|
|
76
74
|
}
|
|
77
75
|
}
|
|
@@ -1,159 +1,127 @@
|
|
|
1
1
|
@use '../core/style/elevation';
|
|
2
|
-
@use '../core/theming/inspection';
|
|
3
2
|
@use '../core/theming/theming';
|
|
4
3
|
@use 'sass:map';
|
|
5
4
|
@use '../core/tokens/m2-utils';
|
|
5
|
+
@use '../core/tokens/m3-utils';
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
// but may be in a future version of the theming API.
|
|
9
|
-
@function get-unthemable-tokens($theme) {
|
|
7
|
+
@function get-tokens($theme) {
|
|
10
8
|
$system: m2-utils.get-system($theme);
|
|
9
|
+
$density-scale: theming.clamp-density(map.get($system, density-scale), -3);
|
|
11
10
|
|
|
12
|
-
// visible-track-opacity and hidden-track-opacity:
|
|
13
|
-
// The hidden and visible track represent whichever track is visible or
|
|
14
|
-
// hidden in the ui. This could be the .mdc-switch__track :before or
|
|
15
|
-
// :after depending on whether the switch is selected or unselected.
|
|
16
|
-
//
|
|
17
|
-
// The m2 slide-toggle uses transforms to hide & show the tracks while
|
|
18
|
-
// the m3 slide-toggle uses opacity.
|
|
19
11
|
@return (
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
(
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
12
|
+
base: (
|
|
13
|
+
// visible-track-opacity and hidden-track-opacity:
|
|
14
|
+
// The hidden and visible track represent whichever track is visible or
|
|
15
|
+
// hidden in the ui. This could be the .mdc-switch__track :before or
|
|
16
|
+
// :after depending on whether the switch is selected or unselected.
|
|
17
|
+
//
|
|
18
|
+
// The m2 slide-toggle uses transforms to hide & show the tracks while
|
|
19
|
+
// the m3 slide-toggle uses opacity.
|
|
20
|
+
slide-toggle-disabled-handle-opacity: 0.38,
|
|
21
|
+
slide-toggle-disabled-selected-handle-opacity: 0.38,
|
|
22
|
+
slide-toggle-disabled-selected-icon-opacity: 0.38,
|
|
23
|
+
slide-toggle-disabled-track-opacity: 0.12,
|
|
24
|
+
slide-toggle-disabled-unselected-handle-opacity: 0.38,
|
|
25
|
+
slide-toggle-disabled-unselected-icon-opacity: 0.38,
|
|
26
|
+
slide-toggle-disabled-unselected-track-outline-color: transparent,
|
|
27
|
+
slide-toggle-disabled-unselected-track-outline-width: 1px,
|
|
28
|
+
slide-toggle-handle-height: 20px,
|
|
29
|
+
slide-toggle-handle-shape: 10px,
|
|
30
|
+
slide-toggle-handle-width: 20px,
|
|
31
|
+
slide-toggle-hidden-track-opacity: 1,
|
|
32
|
+
slide-toggle-hidden-track-transition: transform 75ms 0ms cubic-bezier(0.4, 0, 0.6, 1),
|
|
33
|
+
slide-toggle-pressed-handle-size: 20px,
|
|
34
|
+
slide-toggle-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
|
|
35
|
+
slide-toggle-selected-handle-horizontal-margin: 0,
|
|
36
|
+
slide-toggle-selected-handle-size: 20px,
|
|
37
|
+
slide-toggle-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
|
|
38
|
+
slide-toggle-selected-icon-size: 18px,
|
|
39
|
+
slide-toggle-selected-pressed-handle-horizontal-margin: 0,
|
|
40
|
+
slide-toggle-selected-pressed-state-layer-opacity:
|
|
41
|
+
map.get($system, pressed-state-layer-opacity),
|
|
42
|
+
slide-toggle-selected-track-outline-color: transparent,
|
|
43
|
+
slide-toggle-selected-track-outline-width: 1px,
|
|
44
|
+
slide-toggle-selected-with-icon-handle-horizontal-margin: 0,
|
|
45
|
+
slide-toggle-track-height: 14px,
|
|
46
|
+
slide-toggle-track-outline-color: transparent,
|
|
47
|
+
slide-toggle-track-outline-width: 1px,
|
|
48
|
+
slide-toggle-track-shape: 7px,
|
|
49
|
+
slide-toggle-track-width: 36px,
|
|
50
|
+
slide-toggle-unselected-focus-state-layer-opacity:
|
|
51
|
+
map.get($system, focus-state-layer-opacity),
|
|
52
|
+
slide-toggle-unselected-handle-horizontal-margin: 0,
|
|
53
|
+
slide-toggle-unselected-handle-size: 20px,
|
|
54
|
+
slide-toggle-unselected-hover-state-layer-opacity:
|
|
55
|
+
map.get($system, focus-state-layer-opacity),
|
|
56
|
+
slide-toggle-unselected-icon-size: 18px,
|
|
57
|
+
slide-toggle-unselected-pressed-handle-horizontal-margin: 0,
|
|
58
|
+
slide-toggle-unselected-pressed-state-layer-opacity: 0.1,
|
|
59
|
+
slide-toggle-unselected-with-icon-handle-horizontal-margin: 0,
|
|
60
|
+
slide-toggle-visible-track-opacity: 1,
|
|
61
|
+
slide-toggle-visible-track-transition: transform 75ms 0ms cubic-bezier(0, 0, 0.2, 1),
|
|
62
|
+
slide-toggle-with-icon-handle-size: 20px,
|
|
63
|
+
),
|
|
64
|
+
color: map.merge(private-get-color-palette-color-tokens($theme, primary), (
|
|
65
|
+
slide-toggle-disabled-label-text-color:
|
|
66
|
+
m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
|
|
67
|
+
slide-toggle-disabled-handle-elevation-shadow: elevation.get-box-shadow(0),
|
|
68
|
+
slide-toggle-disabled-selected-handle-color: map.get($system, on-surface),
|
|
69
|
+
slide-toggle-disabled-selected-track-color: map.get($system, on-surface),
|
|
70
|
+
slide-toggle-disabled-unselected-handle-color: map.get($system, on-surface),
|
|
71
|
+
slide-toggle-disabled-unselected-icon-color: map.get($system, surface-variant),
|
|
72
|
+
slide-toggle-disabled-unselected-track-color: map.get($system, on-surface),
|
|
73
|
+
slide-toggle-handle-elevation-shadow: elevation.get-box-shadow(1),
|
|
74
|
+
slide-toggle-handle-surface-color: map.get($system, surface),
|
|
75
|
+
slide-toggle-label-text-color: map.get($system, on-surface),
|
|
76
|
+
slide-toggle-unselected-hover-handle-color: map.get($system, inverse-surface),
|
|
77
|
+
slide-toggle-unselected-focus-handle-color: map.get($system, inverse-surface),
|
|
78
|
+
slide-toggle-unselected-focus-state-layer-color: map.get($system, on-surface),
|
|
79
|
+
slide-toggle-unselected-focus-track-color: map.get($system, outline),
|
|
80
|
+
slide-toggle-unselected-icon-color: map.get($system, surface-variant),
|
|
81
|
+
slide-toggle-unselected-handle-color: map.get($system, on-surface-variant),
|
|
82
|
+
slide-toggle-unselected-hover-state-layer-color: map.get($system, on-surface),
|
|
83
|
+
slide-toggle-unselected-hover-track-color: map.get($system, outline),
|
|
84
|
+
slide-toggle-unselected-pressed-handle-color: map.get($system, inverse-surface),
|
|
85
|
+
slide-toggle-unselected-pressed-track-color: map.get($system, outline),
|
|
86
|
+
slide-toggle-unselected-pressed-state-layer-color: map.get($system, on-surface),
|
|
87
|
+
slide-toggle-unselected-track-color: map.get($system, outline))
|
|
88
|
+
),
|
|
89
|
+
typography: (
|
|
90
|
+
slide-toggle-label-text-font: map.get($system, body-medium-font),
|
|
91
|
+
slide-toggle-label-text-line-height: map.get($system, body-medium-line-height),
|
|
92
|
+
slide-toggle-label-text-size: map.get($system, body-medium-size),
|
|
93
|
+
slide-toggle-label-text-tracking: map.get($system, body-medium-tracking),
|
|
94
|
+
slide-toggle-label-text-weight: map.get($system, body-medium-weight)
|
|
95
|
+
),
|
|
96
|
+
density: (
|
|
97
|
+
slide-toggle-state-layer-size: map.get((
|
|
98
|
+
0: 40px,
|
|
99
|
+
-1: 36px,
|
|
100
|
+
-2: 32px,
|
|
101
|
+
-3: 28px,
|
|
102
|
+
), $density-scale)
|
|
103
|
+
),
|
|
108
104
|
);
|
|
109
105
|
}
|
|
110
106
|
|
|
111
107
|
// Generates the mapping for the properties that change based on the slide toggle color.
|
|
112
|
-
@function private-get-color-palette-color-tokens($theme, $
|
|
113
|
-
$
|
|
114
|
-
$
|
|
115
|
-
$state-content: inspection.get-theme-color($theme, $palette-name, if($is-dark, 200, 900));
|
|
116
|
-
$inverse: inspection.get-theme-color($theme, $palette-name, if($is-dark, 600, 300));
|
|
117
|
-
|
|
118
|
-
@return (
|
|
119
|
-
slide-toggle-selected-focus-state-layer-color: $palette-color,
|
|
120
|
-
slide-toggle-selected-handle-color: $palette-color,
|
|
121
|
-
slide-toggle-selected-hover-state-layer-color: $palette-color,
|
|
122
|
-
slide-toggle-selected-pressed-state-layer-color: $palette-color,
|
|
123
|
-
slide-toggle-selected-focus-handle-color: $state-content,
|
|
124
|
-
slide-toggle-selected-hover-handle-color: $state-content,
|
|
125
|
-
slide-toggle-selected-pressed-handle-color: $state-content,
|
|
126
|
-
slide-toggle-selected-focus-track-color: $inverse,
|
|
127
|
-
slide-toggle-selected-hover-track-color: $inverse,
|
|
128
|
-
slide-toggle-selected-pressed-track-color: $inverse,
|
|
129
|
-
slide-toggle-selected-track-color: $inverse,
|
|
130
|
-
);
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
// Tokens that can be configured through Angular Material's typography theming API.
|
|
134
|
-
@function get-typography-tokens($theme) {
|
|
135
|
-
@return (
|
|
136
|
-
slide-toggle-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
|
|
137
|
-
slide-toggle-label-text-line-height:
|
|
138
|
-
inspection.get-theme-typography($theme, body-2, line-height),
|
|
139
|
-
slide-toggle-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
|
|
140
|
-
slide-toggle-label-text-tracking:
|
|
141
|
-
inspection.get-theme-typography($theme, body-2, letter-spacing),
|
|
142
|
-
slide-toggle-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
|
|
143
|
-
);
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
// Tokens that can be configured through Angular Material's density theming API.
|
|
147
|
-
@function get-density-tokens($theme) {
|
|
148
|
-
$scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
|
|
108
|
+
@function private-get-color-palette-color-tokens($theme, $color-variant) {
|
|
109
|
+
$system: m2-utils.get-system($theme);
|
|
110
|
+
$system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
|
|
149
111
|
|
|
150
112
|
@return (
|
|
151
|
-
|
|
152
|
-
slide-toggle-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
113
|
+
slide-toggle-selected-icon-color: map.get($system, on-primary),
|
|
114
|
+
slide-toggle-disabled-selected-icon-color: map.get($system, on-primary),
|
|
115
|
+
slide-toggle-selected-focus-state-layer-color: map.get($system, primary),
|
|
116
|
+
slide-toggle-selected-handle-color: map.get($system, primary),
|
|
117
|
+
slide-toggle-selected-hover-state-layer-color: map.get($system, primary),
|
|
118
|
+
slide-toggle-selected-pressed-state-layer-color: map.get($system, primary),
|
|
119
|
+
slide-toggle-selected-focus-handle-color: map.get($system, primary),
|
|
120
|
+
slide-toggle-selected-hover-handle-color: map.get($system, primary),
|
|
121
|
+
slide-toggle-selected-pressed-handle-color: map.get($system, primary),
|
|
122
|
+
slide-toggle-selected-focus-track-color: map.get($system, inverse-primary),
|
|
123
|
+
slide-toggle-selected-hover-track-color: map.get($system, inverse-primary),
|
|
124
|
+
slide-toggle-selected-pressed-track-color: map.get($system, inverse-primary),
|
|
125
|
+
slide-toggle-selected-track-color: map.get($system, inverse-primary),
|
|
158
126
|
);
|
|
159
127
|
}
|
|
@@ -60,6 +60,7 @@
|
|
|
60
60
|
slide-toggle-handle-height: null,
|
|
61
61
|
),
|
|
62
62
|
color: (
|
|
63
|
+
slide-toggle-disabled-label-text-color: map.get($system, on-surface),
|
|
63
64
|
slide-toggle-disabled-selected-handle-color: map.get($system, surface),
|
|
64
65
|
slide-toggle-disabled-selected-icon-color: map.get($system, on-surface),
|
|
65
66
|
slide-toggle-disabled-selected-track-color: map.get($system, on-surface),
|