Skip to content

Commit 502faa7

Browse files
authored
fix(multiple): ensure all public theming mixins are exposed at top-level (#25805)
1 parent c370e06 commit 502faa7

28 files changed

+368
-78
lines changed

src/dev-app/theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $candy-app-theme: mat.define-light-theme((
7575
$density-scales: (-1, -2, minimum, maximum);
7676
@each $density in $density-scales {
7777
.demo-density-#{$density} {
78-
@include mat.private-all-component-densities($density);
78+
@include mat.all-component-densities($density);
7979
@include mat.private-all-legacy-component-densities($density);
8080
}
8181
}

src/material/_index.scss

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
font-size, line-height, font-weight, letter-spacing, font-family, font-shorthand;
1616

1717
// Private/Internal
18-
@forward './core/density/private/all-density' as private-* show private-all-component-densities;
18+
@forward './core/density/private/all-density' show all-component-densities;
1919
@forward './legacy-core/density/private/all-density' as private-* show
2020
private-all-legacy-component-densities;
2121
@forward './core/theming/theming' show private-check-duplicate-theme-styles,
@@ -78,18 +78,20 @@
7878
autocomplete-color, autocomplete-typography, autocomplete-density;
7979
@forward './legacy-autocomplete/autocomplete-theme' as legacy-autocomplete-* show
8080
legacy-autocomplete-theme, legacy-autocomplete-color, legacy-autocomplete-typography;
81-
@forward './badge/badge-theme' as badge-* show badge-theme, badge-color, badge-typography;
81+
@forward './badge/badge-theme' as badge-* show badge-theme, badge-color, badge-typography,
82+
badge-density;
8283
@forward './bottom-sheet/bottom-sheet-theme' as bottom-sheet-* show bottom-sheet-theme,
83-
bottom-sheet-color, bottom-sheet-typography;
84+
bottom-sheet-color, bottom-sheet-typography, bottom-sheet-density;
8485
@forward './legacy-button/button-theme' as legacy-button-* show legacy-button-theme,
8586
legacy-button-color, legacy-button-typography;
86-
@forward './button/button-theme' as button-* show button-theme, button-color, button-typography;
87+
@forward './button/button-theme' as button-* show button-theme, button-color, button-typography,
88+
button-density;
8789
@forward './button/fab-theme' as fab-* show fab-color, fab-typography,
8890
fab-density, fab-theme;
8991
@forward './button/icon-button-theme' as icon-button-* show icon-button-color,
9092
icon-button-typography, icon-button-density, icon-button-theme;
9193
@forward './button-toggle/button-toggle-theme' as button-toggle-* show button-toggle-theme,
92-
button-toggle-color, button-toggle-typography;
94+
button-toggle-color, button-toggle-typography, button-toggle-density;
9395
@forward './card/card-theme' as card-* show card-theme, card-color, card-typography, card-density;
9496
@forward './legacy-card/card-theme' as legacy-card-* show legacy-card-theme, legacy-card-color,
9597
legacy-card-typography;
@@ -102,43 +104,44 @@
102104
@forward './chips/chips-theme' as chips-* show chips-theme, chips-color, chips-typography,
103105
chips-density;
104106
@forward './datepicker/datepicker-theme' as datepicker-* show datepicker-theme, datepicker-color,
105-
datepicker-typography, datepicker-date-range-colors;
107+
datepicker-typography, datepicker-date-range-colors, datepicker-density;
106108
@forward './legacy-dialog/dialog-theme' as legacy-dialog-* show legacy-dialog-theme,
107109
legacy-dialog-color, legacy-dialog-typography;
108110
@forward './dialog/dialog-theme' as dialog-* show dialog-theme, dialog-color, dialog-typography,
109111
dialog-density;
110112
@forward './dialog/dialog-legacy-padding' as dialog-* show dialog-legacy-padding;
111113
@forward './divider/divider-theme' as divider-* show divider-theme, divider-color,
112-
divider-typography;
114+
divider-typography, divider-density;
113115
@forward './expansion/expansion-theme' as expansion-* show expansion-theme, expansion-color,
114-
expansion-typography;
116+
expansion-typography, expansion-density;
115117
@forward './form-field/form-field-theme' as form-field-* show form-field-theme,
116118
form-field-color, form-field-typography, form-field-density;
117119
@forward './legacy-form-field/form-field-theme' as legacy-form-field-* show legacy-form-field-theme,
118120
legacy-form-field-color, legacy-form-field-typography;
119121
@forward './grid-list/grid-list-theme' as grid-list-* show grid-list-theme, grid-list-color,
120-
grid-list-typography;
121-
@forward './icon/icon-theme' as icon-* show icon-theme, icon-color, icon-typography;
122+
grid-list-typography, grid-list-density;
123+
@forward './icon/icon-theme' as icon-* show icon-theme, icon-color, icon-typography, icon-density;
122124
@forward './legacy-input/input-theme' as legacy-input-* show legacy-input-theme, legacy-input-color,
123125
legacy-input-typography;
124126
@forward './input/input-theme' as input-* show input-theme, input-color, input-typography,
125127
input-density;
126-
@forward './list/list-theme' as list-* show list-theme, list-color, list-typography;
128+
@forward './list/list-theme' as list-* show list-theme, list-color, list-typography, list-density;
127129
@forward './legacy-list/list-theme' as legacy-list-* show legacy-list-theme, legacy-list-color,
128130
legacy-list-typography;
129-
@forward './menu/menu-theme' as menu-* show menu-theme, menu-color, menu-typography;
131+
@forward './menu/menu-theme' as menu-* show menu-theme, menu-color, menu-typography, menu-density;
130132
@forward './legacy-menu/menu-theme' as legacy-menu-* show legacy-menu-theme, legacy-menu-color,
131133
legacy-menu-typography;
132134
@forward './paginator/paginator-theme' as paginator-* show paginator-theme, paginator-color,
133-
paginator-typography;
135+
paginator-typography, paginator-density;
134136
@forward './legacy-paginator/paginator-theme' as legacy-paginator-* show legacy-paginator-theme,
135137
legacy-paginator-color, legacy-paginator-typography;
136138
@forward './legacy-progress-bar/progress-bar-theme' as legacy-progress-bar-* show
137139
legacy-progress-bar-theme, legacy-progress-bar-color, legacy-progress-bar-typography;
138140
@forward './progress-bar/progress-bar-theme' as progress-bar-* show
139141
progress-bar-theme, progress-bar-color, progress-bar-typography, progress-bar-density;
140142
@forward './progress-spinner/progress-spinner-theme' as progress-spinner-* show
141-
progress-spinner-theme, progress-spinner-color, progress-spinner-typography;
143+
progress-spinner-theme, progress-spinner-color, progress-spinner-typography,
144+
progress-spinner-density;
142145
@forward './legacy-progress-spinner/progress-spinner-theme' as legacy-progress-spinner-* show
143146
legacy-progress-spinner-theme, legacy-progress-spinner-color, legacy-progress-spinner-typography;
144147
@forward './radio/radio-theme' as radio-* show radio-theme, radio-color, radio-typography,
@@ -150,21 +153,22 @@
150153
@forward './legacy-select/select-theme' as legacy-select-* show legacy-select-theme,
151154
legacy-select-color, legacy-select-typography;
152155
@forward './sidenav/sidenav-theme' as sidenav-* show sidenav-theme, sidenav-color,
153-
sidenav-typography;
156+
sidenav-typography, sidenav-density;
154157
@forward './legacy-slide-toggle/slide-toggle-theme' as legacy-slide-toggle-* show
155158
legacy-slide-toggle-theme, legacy-slide-toggle-color, legacy-slide-toggle-typography;
156159
@forward './slide-toggle/slide-toggle-theme' as slide-toggle-* show
157160
slide-toggle-theme, slide-toggle-color, slide-toggle-typography, slide-toggle-density;
158161
@forward './legacy-slider/slider-theme' as legacy-slider-* show legacy-slider-theme,
159162
legacy-slider-color, legacy-slider-typography;
160-
@forward './slider/slider-theme' as slider-* show slider-theme, slider-color, slider-typography;
163+
@forward './slider/slider-theme' as slider-* show slider-theme, slider-color, slider-typography,
164+
slider-density;
161165
@forward './snack-bar/snack-bar-theme' as snack-bar-* show snack-bar-theme, snack-bar-color,
162166
snack-bar-typography, snack-bar-density;
163167
@forward './legacy-snack-bar/snack-bar-theme' as legacy-snack-bar-* show legacy-snack-bar-theme,
164168
legacy-snack-bar-color, legacy-snack-bar-typography;
165-
@forward './sort/sort-theme' as sort-* show sort-theme, sort-color, sort-typography;
169+
@forward './sort/sort-theme' as sort-* show sort-theme, sort-color, sort-typography, sort-density;
166170
@forward './stepper/stepper-theme' as stepper-* show stepper-theme, stepper-color,
167-
stepper-typography;
171+
stepper-typography, stepper-density;
168172
@forward './table/table-theme' as table-* show table-theme, table-color, table-typography,
169173
table-density;
170174
@forward './legacy-table/table-theme' as legacy-table-* show legacy-table-theme, legacy-table-color,
@@ -173,12 +177,12 @@
173177
@forward './legacy-tabs/tabs-theme' as legacy-tabs-* show legacy-tabs-theme, legacy-tabs-color,
174178
legacy-tabs-typography;
175179
@forward './toolbar/toolbar-theme' as toolbar-* show toolbar-theme, toolbar-color,
176-
toolbar-typography;
180+
toolbar-typography, toolbar-density;
177181
@forward './legacy-tooltip/tooltip-theme' as legacy-tooltip-* show legacy-tooltip-theme,
178182
legacy-tooltip-color, legacy-tooltip-typography;
179183
@forward './tooltip/tooltip-theme' as tooltip-* show tooltip-theme, tooltip-color,
180184
tooltip-typography, tooltip-density;
181-
@forward './tree/tree-theme' as tree-* show tree-theme, tree-color, tree-typography;
185+
@forward './tree/tree-theme' as tree-* show tree-theme, tree-color, tree-typography, tree-density;
182186

183187
// MDC Helpers
184188
@forward './core/mdc-helpers/mdc-helpers' as private-* show private-using-mdc-theme,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size,
2-
color, theme, typography;
2+
color, theme, typography, density;
33
@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size;

src/material/badge/_badge-theme.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@forward '../core/typography/typography-utils.import';
33
@forward '../../cdk/a11y/index.import';
44
@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size,
5-
color, theme, typography;
5+
color, theme, typography, density;
66
@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size;
77

88
@import '../core/theming/palette';

src/material/badge/_badge-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ $_badge-structure-emitted: false !default;
229229
}
230230
}
231231

232-
@mixin _density($config-or-theme) {}
232+
@mixin density($config-or-theme) {}
233233

234234
@mixin theme($theme-or-color-config) {
235235
$theme: theming.private-legacy-get-theme($theme-or-color-config);
@@ -254,7 +254,7 @@ $_badge-structure-emitted: false !default;
254254
@include color($color);
255255
}
256256
@if $density != null {
257-
@include _density($density);
257+
@include density($density);
258258
}
259259
@if $typography != null {
260260
@include typography($typography);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@forward 'bottom-sheet-theme' hide color, theme, typography;
1+
@forward 'bottom-sheet-theme' hide color, theme, typography, density;
22
@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density;

src/material/bottom-sheet/_bottom-sheet-theme.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@forward '../core/style/private.import';
22
@forward '../core/theming/theming.import';
33
@forward '../core/typography/typography-utils.import';
4-
@forward 'bottom-sheet-theme' hide color, theme, typography;
4+
@forward 'bottom-sheet-theme' hide color, theme, typography, density;
55
@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density;
66

77
@import '../core/style/private';

src/material/bottom-sheet/_bottom-sheet-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525
}
2626

27-
@mixin _density($config-or-theme) {}
27+
@mixin density($config-or-theme) {}
2828

2929
@mixin theme($theme-or-color-config) {
3030
$theme: theming.private-legacy-get-theme($theme-or-color-config);
@@ -37,7 +37,7 @@
3737
@include color($color);
3838
}
3939
@if $density != null {
40-
@include _density($density);
40+
@include density($density);
4141
}
4242
@if $typography != null {
4343
@include typography($typography);

src/material/core/theming/tests/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ sass_binary(
4646
)
4747

4848
build_test(
49-
name = "sass_compile_tetss",
49+
name = "sass_compile_tests",
5050
targets = [
5151
":test-css-variables-theme",
5252
":test-theming-api",

0 commit comments

Comments
 (0)