Skip to content

Commit 8b3c82d

Browse files
crisbetocrisbeto
authored
fix(material/core): restore private- mixin prefix (angular#21989)
* In angular#21204 the `private-` prefix was unintentionally removed from all of the symbols. These changes restore the prefix. * Fixes the prefixes on the expansion panel theming mixins.
1 parent c34511e commit 8b3c82d

File tree

125 files changed

+447
-469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+447
-469
lines changed

‎scripts/migrate-sass-modules.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const materialPrefixes = [
2727
'mat-pseudo-checkbox-',
2828
'mat-elevation-',
2929
'mat-optgroup-',
30-
'mat-private-'
30+
'mat-expansion-panel-'
3131
];
3232
const mdcPrefixes = [
3333
...getPrefixes('material-experimental', 'mat'),

‎src/material-experimental/column-resize/_column-resize.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
@mixin density($config-or-theme) {}
106106

107107
@mixin theme($theme-or-color-config) {
108-
$theme: theming.legacy-get-theme($theme-or-color-config);
109-
@include theming.check-duplicate-theme-styles($theme, 'mat-column-resize') {
108+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
109+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-column-resize') {
110110
$color: theming.get-color-config($theme);
111111
$density: theming.get-density-config($theme);
112112
$typography: theming.get-typography-config($theme);

‎src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
@mixin density($config-or-theme) {}
2828

2929
@mixin theme($theme-or-color-config) {
30-
$theme: theming.legacy-get-theme($theme-or-color-config);
31-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-autocomplete') {
30+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
31+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-autocomplete') {
3232
$color: theming.get-color-config($theme);
3333
$density: theming.get-density-config($theme);
3434
$typography: theming.get-typography-config($theme);

‎src/material-experimental/mdc-button/_button-theme.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ $mat-button-state-target: '.mdc-button__ripple';
190190
}
191191

192192
@mixin theme($theme-or-color-config) {
193-
$theme: theming.legacy-get-theme($theme-or-color-config);
194-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-button') {
193+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
194+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-button') {
195195
$color: theming.get-color-config($theme);
196196
$density: theming.get-density-config($theme);
197197
$typography: theming.get-typography-config($theme);
@@ -269,8 +269,8 @@ $mat-button-state-target: '.mdc-button__ripple';
269269
@mixin fab-density($config-or-theme) {}
270270

271271
@mixin fab-theme($theme-or-color-config) {
272-
$theme: theming.legacy-get-theme($theme-or-color-config);
273-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-fab') {
272+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
273+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-fab') {
274274
$color: theming.get-color-config($theme);
275275
$density: theming.get-density-config($theme);
276276
$typography: theming.get-typography-config($theme);
@@ -347,8 +347,8 @@ $mat-button-state-target: '.mdc-button__ripple';
347347
}
348348

349349
@mixin icon-button-theme($theme-or-color-config) {
350-
$theme: theming.legacy-get-theme($theme-or-color-config);
351-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-icon-button') {
350+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
351+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-icon-button') {
352352
$color: theming.get-color-config($theme);
353353
$density: theming.get-density-config($theme);
354354
$typography: theming.get-typography-config($theme);

‎src/material-experimental/mdc-card/_card-theme.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
@mixin density($config-or-theme) {}
5555

5656
@mixin theme($theme-or-color-config) {
57-
$theme: theming.legacy-get-theme($theme-or-color-config);
58-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-card') {
57+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
58+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-card') {
5959
$color: theming.get-color-config($theme);
6060
$density: theming.get-density-config($theme);
6161
$typography: theming.get-typography-config($theme);

‎src/material-experimental/mdc-checkbox/_checkbox-theme.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@
144144
}
145145

146146
@mixin theme($theme-or-color-config) {
147-
$theme: theming.legacy-get-theme($theme-or-color-config);
148-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-checkbox') {
147+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
148+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-checkbox') {
149149
$color: theming.get-color-config($theme);
150150
$density: theming.get-density-config($theme);
151151
$typography: theming.get-typography-config($theme);

‎src/material-experimental/mdc-chips/_chips-theme.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
}
9292

9393
@mixin theme($theme-or-color-config) {
94-
$theme: theming.legacy-get-theme($theme-or-color-config);
95-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-chips') {
94+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
95+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-chips') {
9696
$color: theming.get-color-config($theme);
9797
$density: theming.get-density-config($theme);
9898
$typography: theming.get-typography-config($theme);

‎src/material-experimental/mdc-color/_all-color.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@mixin angular-material-mdc-color($config-or-theme) {
55
// In case a theme object has been passed instead of a configuration for
66
// the color system, extract the color config from the theme object.
7-
$config: if(theming.is-theme-object($config-or-theme),
7+
$config: if(theming.private-is-theme-object($config-or-theme),
88
theming.get-color-config($config-or-theme), $config-or-theme);
99

1010
@if $config == null {

‎src/material-experimental/mdc-core/_core-theme.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
// Mixin that renders all of the core styles that depend on the theme.
66
@mixin theme($theme-or-color-config) {
7-
$theme: theming.legacy-get-theme($theme-or-color-config);
7+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
88
// Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that
99
// there won't be multiple warnings. e.g. if `mat-mdc-core-theme` reports a warning, then
1010
// the imported themes (such as `mat-ripple-theme`) should not report again.
11-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-core') {
11+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-core') {
1212
@include option-theme.option-theme($theme);
1313
@include optgroup-theme.theme($theme);
1414
}

‎src/material-experimental/mdc-core/option/_optgroup-theme.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
}
2929

3030
@mixin theme($theme-or-color-config) {
31-
$theme: theming.legacy-get-theme($theme-or-color-config);
32-
@include theming.check-duplicate-theme-styles($theme, 'mat-mdc-optgroup') {
31+
$theme: theming.private-legacy-get-theme($theme-or-color-config);
32+
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-optgroup') {
3333
$color: theming.get-color-config($theme);
3434
$density: theming.get-density-config($theme);
3535
$typography: theming.get-typography-config($theme);

0 commit comments

Comments
 (0)