Skip to content

Commit c4b83a8

Browse files
committed
fixup! feat(material/select): switch implementation to use MDC
1 parent 918d952 commit c4b83a8

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

src/material/core/density/private/_all-density.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
// not possible as it would introduce a circular dependency for density because the `mat-core`
4343
// mixin that is transitively loaded by the `all-theme` file, imports `all-density` which
4444
// would then load `all-theme` again. This ultimately results a circular dependency.
45+
@include private-all-unmigrated-component-densities($config);
4546
@include form-field-theme.density($config);
4647
@include input-theme.density($config);
4748
@include option-theme.density($config);
4849
@include optgroup-theme.density($config);
4950
@include select-theme.density($config);
50-
@include private-all-unmigrated-component-densities($config);
5151
}
5252

5353

src/material/core/theming/_all-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
@include icon-theme.theme($theme-or-color-config);
5454
@include list-theme.theme($theme-or-color-config);
5555
@include menu-theme.theme($theme-or-color-config);
56+
// TODO: when migrating paginator, ensure that it is included *before* select.
5657
@include paginator-theme.theme($theme-or-color-config);
5758
@include progress-spinner-theme.theme($theme-or-color-config);
5859
@include radio-theme.theme($theme-or-color-config);
@@ -72,13 +73,13 @@
7273
$dedupe-key: 'angular-material-theme';
7374
@include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) {
7475
@include core-theme.theme($theme-or-color-config);
76+
@include private-all-unmigrated-component-themes($theme-or-color-config);
7577
@include card-theme.theme($theme-or-color-config);
7678
@include progress-bar-theme.theme($theme-or-color-config);
7779
@include tooltip-theme.theme($theme-or-color-config);
7880
@include form-field-theme.theme($theme-or-color-config);
7981
@include input-theme.theme($theme-or-color-config);
8082
@include select-theme.theme($theme-or-color-config);
81-
@include private-all-unmigrated-component-themes($theme-or-color-config);
8283
}
8384
}
8485

src/material/core/typography/_all-typography.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
@mixin private-all-unmigrated-component-typographies($config) {
4141
@include badge-theme.typography($config);
42-
@include typography.typography-hierarchy($config);
4342
@include autocomplete-theme.typography($config);
4443
@include bottom-sheet-theme.typography($config);
4544
@include button-theme.typography($config);
@@ -54,6 +53,7 @@
5453
@include grid-list-theme.typography($config);
5554
@include icon-theme.typography($config);
5655
@include menu-theme.typography($config);
56+
// TODO: when migrating paginator, ensure that it is included *before* select.
5757
@include paginator-theme.typography($config);
5858
@include progress-spinner-theme.typography($config);
5959
@include radio-theme.typography($config);
@@ -85,6 +85,7 @@
8585
// not possible as it would introduce a circular dependency for typography because the `mat-core`
8686
// mixin that is transitively loaded by the `all-theme` file, imports `all-typography` which
8787
// would then load `all-theme` again. This ultimately results a circular dependency.
88+
@include typography.typography-hierarchy($config);
8889
@include private-all-unmigrated-component-typographies($config);
8990
@include card-theme.typography($config);
9091
@include progress-bar-theme.typography($config);

src/material/legacy-core/theming/_all-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
$dedupe-key: 'angular-material-legacy-theme';
1414
@include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) {
1515
@include core-theme.theme($theme-or-color-config);
16+
@include all-theme.private-all-unmigrated-component-themes($theme-or-color-config);
1617
@include card-theme.theme($theme-or-color-config);
1718
@include progress-bar-theme.theme($theme-or-color-config);
1819
@include tooltip-theme.theme($theme-or-color-config);
1920
@include input-theme.theme($theme-or-color-config);
2021
@include form-field-theme.theme($theme-or-color-config);
2122
@include select-theme.theme($theme-or-color-config);
22-
@include all-theme.private-all-unmigrated-component-themes($theme-or-color-config);
2323
}
2424
}
2525

src/material/legacy-core/typography/_all-typography.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
// mixin that is transitively loaded by the `all-theme` file, imports `all-typography` which
2727
// would then load `all-theme` again. This ultimately results a circular dependency.
2828

29+
@include typography.typography-hierarchy($config);
2930
@include all-typography.private-all-unmigrated-component-typographies($config);
3031
@include option-theme.typography($config);
3132
@include optgroup-theme.typography($config);

0 commit comments

Comments
 (0)