Skip to content

Commit b2265f4

Browse files
andrewseguinandrewseguin
committed
refactor: merge form field tokens
1 parent f9dc89b commit b2265f4

15 files changed

+558
-854
lines changed

‎src/material/core/tokens/_m2-tokens.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
@use '../../dialog/m2-dialog';
1313
@use '../../divider/m2-divider';
1414
@use '../../expansion/m2-expansion';
15-
@use '../../form-field/m2-filled-text-field';
1615
@use '../../form-field/m2-form-field';
17-
@use '../../form-field/m2-outlined-text-field';
1816
@use '../../grid-list/m2-grid-list';
1917
@use '../../icon/m2-icon';
2018
@use '../../list/m2-list';
@@ -105,7 +103,6 @@
105103
_get-tokens-for-module($theme, m2-divider),
106104
_get-tokens-for-module($theme, m2-expansion),
107105
_get-tokens-for-module($theme, m2-fab),
108-
_get-tokens-for-module($theme, m2-filled-text-field),
109106
_get-tokens-for-module($theme, m2-form-field),
110107
_get-tokens-for-module($theme, m2-grid-list),
111108
_get-tokens-for-module($theme, m2-icon),
@@ -114,7 +111,6 @@
114111
_get-tokens-for-module($theme, m2-menu),
115112
_get-tokens-for-module($theme, m2-optgroup),
116113
_get-tokens-for-module($theme, m2-option),
117-
_get-tokens-for-module($theme, m2-outlined-text-field),
118114
_get-tokens-for-module($theme, m2-paginator),
119115
_get-tokens-for-module($theme, m2-progress-bar),
120116
_get-tokens-for-module($theme, m2-progress-spinner),

‎src/material/core/tokens/_m3-tokens.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
@use '../../dialog/m3-dialog';
1313
@use '../../divider/m3-divider';
1414
@use '../../expansion/m3-expansion';
15-
@use '../../form-field/m3-filled-text-field';
1615
@use '../../form-field/m3-form-field';
17-
@use '../../form-field/m3-outlined-text-field';
1816
@use '../../grid-list/m3-grid-list';
1917
@use '../../icon/m3-icon';
2018
@use '../../list/m3-list';
@@ -430,7 +428,6 @@ $system-variables-prefix) {
430428
m3-divider.get-tokens($systems, $exclude-hardcoded, $token-slots),
431429
m3-expansion.get-tokens($systems, $exclude-hardcoded, $token-slots),
432430
m3-fab.get-tokens($systems, $exclude-hardcoded, $token-slots),
433-
m3-filled-text-field.get-tokens($systems, $exclude-hardcoded, $token-slots),
434431
m3-form-field.get-tokens($systems, $exclude-hardcoded, $token-slots),
435432
m3-grid-list.get-tokens($systems, $exclude-hardcoded, $token-slots),
436433
m3-icon-button.get-tokens($systems, $exclude-hardcoded, $token-slots),
@@ -439,7 +436,6 @@ $system-variables-prefix) {
439436
m3-menu.get-tokens($systems, $exclude-hardcoded, $token-slots),
440437
m3-optgroup.get-tokens($systems, $exclude-hardcoded, $token-slots),
441438
m3-option.get-tokens($systems, $exclude-hardcoded, $token-slots),
442-
m3-outlined-text-field.get-tokens($systems, $exclude-hardcoded, $token-slots),
443439
m3-paginator.get-tokens($systems, $exclude-hardcoded, $token-slots),
444440
m3-progress-bar.get-tokens($systems, $exclude-hardcoded, $token-slots),
445441
m3-progress-spinner.get-tokens($systems, $exclude-hardcoded, $token-slots),

‎src/material/form-field/BUILD.bazel

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ package(default_visibility = ["//visibility:public"])
1212
sass_library(
1313
name = "m3",
1414
srcs = [
15-
"_m3-filled-text-field.scss",
1615
"_m3-form-field.scss",
17-
"_m3-outlined-text-field.scss",
1816
],
1917
deps = [
2018
"//src/material/core/style:sass_utils",
@@ -25,9 +23,7 @@ sass_library(
2523
sass_library(
2624
name = "m2",
2725
srcs = [
28-
"_m2-filled-text-field.scss",
2926
"_m2-form-field.scss",
30-
"_m2-outlined-text-field.scss",
3127
],
3228
deps = [
3329
"//src/material/core/style:elevation",

‎src/material/form-field/_form-field-focus-overlay.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
opacity: 0;
1616
pointer-events: none; // Make sure we don't block click on the prefix/suffix.
1717

18-
@include token-utils.use-tokens(
19-
m2-form-field.$prefix, m2-form-field.get-token-slots()) {
18+
@include token-utils.use-tokens(m2-form-field.$prefix, m2-form-field.get-token-slots()) {
2019
background-color: token-utils.slot(state-layer-color);
2120

2221
.mat-mdc-text-field-wrapper:hover & {

‎src/material/form-field/_form-field-subscript.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
.mat-mdc-form-field-error {
7373
display: block;
7474

75-
@include token-utils.use-tokens(
76-
m2-form-field.$prefix, m2-form-field.get-token-slots()) {
75+
@include token-utils.use-tokens(m2-form-field.$prefix, m2-form-field.get-token-slots()) {
7776
color: token-utils.slot(error-text-color);
7877
}
7978
}

‎src/material/form-field/_form-field-theme.scss

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@use './m2-filled-text-field';
2-
@use './m2-outlined-text-field';
31
@use './m2-form-field';
42
@use '../core/theming/theming';
53
@use '../core/theming/inspection';
@@ -16,14 +14,6 @@
1614
@include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
1715
} @else {
1816
@include sass-utils.current-selector-or-root() {
19-
@include token-utils.create-token-values-mixed(
20-
m2-filled-text-field.$prefix,
21-
m2-filled-text-field.get-unthemable-tokens()
22-
);
23-
@include token-utils.create-token-values-mixed(
24-
m2-outlined-text-field.$prefix,
25-
m2-outlined-text-field.get-unthemable-tokens()
26-
);
2717
@include token-utils.create-token-values-mixed(
2818
m2-form-field.$prefix,
2919
m2-form-field.get-unthemable-tokens()
@@ -42,44 +32,20 @@
4232
@include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
4333
} @else {
4434
@include sass-utils.current-selector-or-root() {
45-
@include token-utils.create-token-values-mixed(
46-
m2-filled-text-field.$prefix,
47-
m2-filled-text-field.get-color-tokens($theme)
48-
);
49-
@include token-utils.create-token-values-mixed(
50-
m2-outlined-text-field.$prefix,
51-
m2-outlined-text-field.get-color-tokens($theme)
52-
);
5335
@include token-utils.create-token-values-mixed(
5436
m2-form-field.$prefix,
5537
m2-form-field.get-color-tokens($theme)
5638
);
5739
}
5840

5941
.mat-mdc-form-field.mat-accent {
60-
@include token-utils.create-token-values-mixed(
61-
m2-filled-text-field.$prefix,
62-
m2-filled-text-field.private-get-color-palette-color-tokens($theme, accent)
63-
);
64-
@include token-utils.create-token-values-mixed(
65-
m2-outlined-text-field.$prefix,
66-
m2-outlined-text-field.private-get-color-palette-color-tokens($theme, accent)
67-
);
6842
@include token-utils.create-token-values-mixed(
6943
m2-form-field.$prefix,
7044
m2-form-field.private-get-color-palette-color-tokens($theme, accent)
7145
);
7246
}
7347

7448
.mat-mdc-form-field.mat-warn {
75-
@include token-utils.create-token-values-mixed(
76-
m2-filled-text-field.$prefix,
77-
m2-filled-text-field.private-get-color-palette-color-tokens($theme, warn)
78-
);
79-
@include token-utils.create-token-values-mixed(
80-
m2-outlined-text-field.$prefix,
81-
m2-outlined-text-field.private-get-color-palette-color-tokens($theme, warn)
82-
);
8349
@include token-utils.create-token-values-mixed(
8450
m2-form-field.$prefix,
8551
m2-form-field.private-get-color-palette-color-tokens($theme, warn)
@@ -95,14 +61,6 @@
9561
@include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
9662
} @else {
9763
@include sass-utils.current-selector-or-root() {
98-
@include token-utils.create-token-values-mixed(
99-
m2-filled-text-field.$prefix,
100-
m2-filled-text-field.get-typography-tokens($theme)
101-
);
102-
@include token-utils.create-token-values-mixed(
103-
m2-outlined-text-field.$prefix,
104-
m2-outlined-text-field.get-typography-tokens($theme)
105-
);
10664
@include token-utils.create-token-values-mixed(
10765
m2-form-field.$prefix,
10866
m2-form-field.get-typography-tokens($theme)
@@ -128,21 +86,9 @@
12886

12987
/// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
13088
@function _define-overrides() {
131-
$filled-text-field-tokens: m2-filled-text-field.get-token-slots();
132-
$outlined-text-field-tokens: m2-outlined-text-field.get-token-slots();
13389
$form-field-tokens: m2-form-field.get-token-slots();
13490

13591
@return (
136-
(
137-
namespace: m2-filled-text-field.$prefix,
138-
tokens: $filled-text-field-tokens,
139-
prefix: 'filled-',
140-
),
141-
(
142-
namespace: m2-outlined-text-field.$prefix,
143-
tokens: $outlined-text-field-tokens,
144-
prefix: 'outlined-',
145-
),
14692
(
14793
namespace: m2-form-field.$prefix,
14894
tokens: $form-field-tokens,
@@ -184,28 +130,10 @@
184130
@include validation.selector-defined(
185131
'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
186132
);
187-
$mdc-filled-text-field-tokens: token-utils.get-tokens-for(
188-
$tokens,
189-
m2-filled-text-field.$prefix,
190-
$options...
191-
);
192-
$mdc-outlined-text-field-tokens: token-utils.get-tokens-for(
193-
$tokens,
194-
m2-outlined-text-field.$prefix,
195-
$options...
196-
);
197133
$mat-form-field-tokens: token-utils.get-tokens-for(
198134
$tokens,
199135
m2-form-field.$prefix,
200136
$options...
201137
);
202-
@include token-utils.create-token-values(
203-
m2-filled-text-field.$prefix,
204-
$mdc-filled-text-field-tokens
205-
);
206-
@include token-utils.create-token-values(
207-
m2-outlined-text-field.$prefix,
208-
$mdc-outlined-text-field-tokens
209-
);
210138
@include token-utils.create-token-values(m2-form-field.$prefix, $mat-form-field-tokens);
211139
}

‎src/material/form-field/_m2-filled-text-field.scss

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)