Skip to content

Commit 12f453f

Browse files
mmalerbammalerba
committed
6. Fix any remaining CI issues
1 parent 29fd592 commit 12f453f

File tree

9 files changed

+33
-32
lines changed

9 files changed

+33
-32
lines changed

‎integration/mdc-migration/golden/src/styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ $sample-project-theme: mat.define-light-theme((
6767
@include mat.mdc-slider-theme($sample-project-theme);
6868
@include mat.mdc-slider-typography($sample-project-theme);
6969
@include mat.snack-bar-typography($sample-project-theme);
70-
@include mat.mdc-table-theme($sample-project-theme);
71-
@include mat.mdc-table-typography($sample-project-theme);
70+
@include mat.table-theme($sample-project-theme);
71+
@include mat.table-typography($sample-project-theme);
7272
@include mat.tabs-theme($sample-project-theme);
7373
@include mat.tabs-typography($sample-project-theme);
7474
@include mat.mdc-tooltip-theme($sample-project-theme);

‎src/material/legacy-table/_table-legacy-index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@forward 'table-theme' hide color, theme, typography;
22
@forward 'table-theme' as mat-legacy-table-* hide mat-legacy-table-density;
3-
@forward 'table-flex-styles' as mat-*;
3+
@forward '../table/table-flex-styles' as mat-*;

‎src/material/legacy-table/_table-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

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

‎src/material/schematics/collection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"table": {
2525
"description": "Create a component that displays data with a data-table",
26-
"factory": "./ng-generate/legacy-table/index",
27-
"schema": "./ng-generate/legacy-table/schema.json",
26+
"factory": "./ng-generate/table/index",
27+
"schema": "./ng-generate/table/schema.json",
2828
"aliases": ["material-table"]
2929
},
3030
"navigation": {

‎src/material/schematics/ng-generate/mdc-migration/rules/components/table/table-styles.spec.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ describe('table styles', () => {
2828
`
2929
@use '@angular/material' as mat;
3030
$theme: ();
31-
@include mat.mdc-table-theme($theme);
32-
@include mat.mdc-table-typography($theme);
31+
@include mat.table-theme($theme);
32+
@include mat.table-typography($theme);
3333
`,
3434
);
3535
});
@@ -39,13 +39,13 @@ describe('table styles', () => {
3939
`
4040
@use '@angular/material' as arbitrary;
4141
$theme: ();
42-
@include arbitrary.table-theme($theme);
42+
@include arbitrary.legacy-table-theme($theme);
4343
`,
4444
`
4545
@use '@angular/material' as arbitrary;
4646
$theme: ();
47-
@include arbitrary.mdc-table-theme($theme);
48-
@include arbitrary.mdc-table-typography($theme);
47+
@include arbitrary.table-theme($theme);
48+
@include arbitrary.table-typography($theme);
4949
`,
5050
);
5151
});
@@ -63,10 +63,10 @@ describe('table styles', () => {
6363
@use '@angular/material' as mat;
6464
$light-theme: ();
6565
$dark-theme: ();
66-
@include mat.mdc-table-theme($light-theme);
67-
@include mat.mdc-table-typography($light-theme);
68-
@include mat.mdc-table-theme($dark-theme);
69-
@include mat.mdc-table-typography($dark-theme);
66+
@include mat.table-theme($light-theme);
67+
@include mat.table-typography($light-theme);
68+
@include mat.table-theme($dark-theme);
69+
@include mat.table-typography($dark-theme);
7070
`,
7171
);
7272
});
@@ -87,8 +87,8 @@ describe('table styles', () => {
8787
$theme: ();
8888
8989
90-
@include mat.mdc-table-theme($theme);
91-
@include mat.mdc-table-typography($theme);
90+
@include mat.table-theme($theme);
91+
@include mat.table-typography($theme);
9292
9393
9494
`,

‎src/material/schematics/ng-generate/mdc-migration/rules/components/table/table-styles.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export class TableStylesMigrator extends StyleMigrator {
1717

1818
mixinChanges = [
1919
{
20-
old: 'table-theme',
21-
new: ['mdc-table-theme', 'mdc-table-typography'],
20+
old: 'legacy-table-theme',
21+
new: ['table-theme', 'table-typography'],
2222
},
2323
];
2424

‎src/material/schematics/ng-generate/mdc-migration/rules/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {SelectStylesMigrator} from './components/select/select-styles';
3030
import {SlideToggleStylesMigrator} from './components/slide-toggle/slide-toggle-styles';
3131
import {SliderStylesMigrator} from './components/slider/slider-styles';
3232
import {SnackBarMigrator} from './components/snack-bar/snack-bar-styles';
33-
import {TableStylesMigrator} from './components/legacy-table/table-styles';
33+
import {TableStylesMigrator} from './components/table/table-styles';
3434
import {TabsStylesMigrator} from './components/tabs/tabs-styles';
3535
import {TooltipStylesMigrator} from './components/tooltip/tooltip-styles';
3636

‎src/material/schematics/ng-update/test-cases/v12/misc/theming-api-v12.spec.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ describe('v12 theming API migration', () => {
378378
`));`,
379379

380380
`@include mat-button-theme($candy-app-theme);`,
381-
`@include mat.legacy-table-theme($candy-app-theme);`,
381+
`@include mat.table-theme($candy-app-theme);`,
382382
`@include mat-expansion-panel-theme($candy-app-theme);`,
383383
`@include mat-datepicker-theme($candy-app-theme);`,
384384
`@include mat-option-theme($candy-app-theme);`,
@@ -401,7 +401,7 @@ describe('v12 theming API migration', () => {
401401
`));`,
402402

403403
`@include mat.button-theme($candy-app-theme);`,
404-
`@include mat.legacy-table-theme($candy-app-theme);`,
404+
`@include mat.table-theme($candy-app-theme);`,
405405
// This one is a special case, because the migration also fixes an incorrect name.
406406
`@include mat.expansion-theme($candy-app-theme);`,
407407
`@include mat.datepicker-theme($candy-app-theme);`,
@@ -414,7 +414,7 @@ describe('v12 theming API migration', () => {
414414
`@import '@angular/material/core/theming/palette';`,
415415
`@import '@angular/material/core/theming/theming';`,
416416
`@import '@angular/material/button/button-theme';`,
417-
`@import '@angular/material/legacy-table/table-theme';`,
417+
`@import '@angular/material/table/table-theme';`,
418418
`@import '@angular/cdk/overlay';`,
419419
`@import '@angular/material/datepicker/datepicker-theme';`,
420420
`@import '@angular/material/option/option-theme';`,
@@ -431,7 +431,7 @@ describe('v12 theming API migration', () => {
431431
`));`,
432432

433433
`@include mat-button-theme($candy-app-theme);`,
434-
`@include mat.legacy-table-theme($candy-app-theme);`,
434+
`@include mat.table-theme($candy-app-theme);`,
435435
`@include mat-datepicker-theme($candy-app-theme);`,
436436
`@include mat-option-theme($candy-app-theme);`,
437437
]);
@@ -454,7 +454,7 @@ describe('v12 theming API migration', () => {
454454
`));`,
455455

456456
`@include mat.button-theme($candy-app-theme);`,
457-
`@include mat.legacy-table-theme($candy-app-theme);`,
457+
`@include mat.table-theme($candy-app-theme);`,
458458
`@include mat.datepicker-theme($candy-app-theme);`,
459459
`@include mat.option-theme($candy-app-theme);`,
460460
]);
@@ -465,7 +465,7 @@ describe('v12 theming API migration', () => {
465465
`@use '@angular/material/core/theming/palette' as palette;`,
466466
`@use '@angular/material/core/theming/theming';`,
467467
`@use '@angular/material/button/button-theme' as button;`,
468-
`@use '@angular/material/legacy-table/table-theme' as table;`,
468+
`@use '@angular/material/table/table-theme' as table;`,
469469
// Leave one `@import` here to verify mixed usage.
470470
`@import '@angular/material/option/option-theme';`,
471471
`@use '@angular/cdk/overlay' as cdk;`,
@@ -506,7 +506,7 @@ describe('v12 theming API migration', () => {
506506
`));`,
507507

508508
`@include mat.button-theme($candy-app-theme);`,
509-
`@include mat.legacy-table-theme($candy-app-theme);`,
509+
`@include mat.table-theme($candy-app-theme);`,
510510
`@include mat.datepicker-theme($candy-app-theme);`,
511511
`@include mat.option-theme($candy-app-theme);`,
512512
]);
@@ -516,7 +516,7 @@ describe('v12 theming API migration', () => {
516516
writeLines(THEME_PATH, [
517517
`@use '@angular/material/core/index';`,
518518
`@use '@angular/material/button/_button-theme';`,
519-
`@use '@angular/material/legacy-table/table-theme.import';`,
519+
`@use '@angular/material/table/table-theme.import';`,
520520
`@use '@angular/material/datepicker/datepicker-theme.scss';`,
521521

522522
`@include core.mat-core();`,
@@ -532,7 +532,7 @@ describe('v12 theming API migration', () => {
532532

533533
`@include mat.core();`,
534534
`@include mat.button-theme();`,
535-
`@include mat.legacy-table-theme();`,
535+
`@include mat.table-theme();`,
536536
`@include mat.datepicker-theme();`,
537537
]);
538538
});
@@ -925,7 +925,7 @@ describe('v12 theming API migration', () => {
925925
`@import '~@angular/material/core/theming/palette';`,
926926
`@import '~@angular/material/core/theming/theming';`,
927927
`@import '~@angular/material/button/button-theme';`,
928-
`@import '~@angular/material/legacy-table/table-theme';`,
928+
`@import '~@angular/material/table/table-theme';`,
929929
`@import '~@angular/cdk/overlay';`,
930930
`@import '~@angular/material/datepicker/datepicker-theme';`,
931931
`@import '~@angular/material/option/option-theme';`,
@@ -942,7 +942,7 @@ describe('v12 theming API migration', () => {
942942
`));`,
943943

944944
`@include mat-button-theme($candy-app-theme);`,
945-
`@include mat.legacy-table-theme($candy-app-theme);`,
945+
`@include mat.table-theme($candy-app-theme);`,
946946
`@include mat-datepicker-theme($candy-app-theme);`,
947947
`@include mat-option-theme($candy-app-theme);`,
948948
]);
@@ -965,7 +965,7 @@ describe('v12 theming API migration', () => {
965965
`));`,
966966

967967
`@include mat.button-theme($candy-app-theme);`,
968-
`@include mat.legacy-table-theme($candy-app-theme);`,
968+
`@include mat.table-theme($candy-app-theme);`,
969969
`@include mat.datepicker-theme($candy-app-theme);`,
970970
`@include mat.option-theme($candy-app-theme);`,
971971
]);

‎src/material/table/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ sass_binary(
4242
name = "table_scss",
4343
src = "table.scss",
4444
deps = [
45+
":table_flex_scss_lib",
4546
"//:mdc_sass_lib",
4647
"//src/material/core:core_scss_lib",
4748
],

0 commit comments

Comments
 (0)