Skip to content

Commit fd5afe7

Browse files
authored
fix(material/core): Move remaining MDC core functionality out of experimental (#25503)
1 parent a2a22a4 commit fd5afe7

Some content is hidden

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

43 files changed

+172
-749
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
/src/material/card/** @mmalerba
117117
/src/material/checkbox/** @mmalerba
118118
/src/material/chips/** @mmalerba @crisbeto
119-
/src/material-experimental/mdc-core/** @crisbeto
120119
/src/material/dialog/** @devversion
121120
/src/material/form-field/** @devversion @mmalerba
122121
/src/material/list/** @mmalerba @devversion

.ng-dev/commit-message.mts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export const commitMessage: CommitMessageConfig = {
4343
'material/button',
4444
'material/card',
4545
'material/checkbox',
46-
'material-experimental/mdc-core',
4746
'material/dialog',
4847
'material/form-field',
4948
'material/input',

integration/yarn-pnp-compat/src/styles.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as experimental;
32

43
$primary: mat.define-palette(mat.$blue-palette);
54
$accent: mat.define-palette(mat.$grey-palette);
6-
$theme: mat.define-light-theme($primary, $accent);
5+
$theme: mat.define-light-theme((
6+
color: (primary: $primary, accent: $accent),
7+
typography: mat.define-typography-config(),
8+
density: 0
9+
));
710

811
@include mat.core($theme);
912

13+
@include mat.all-legacy-component-themes($theme);
1014
@include mat.all-component-themes($theme);
11-
@include experimental.all-mdc-component-themes($theme);
1215

1316
html,
1417
body {

src/dev-app/theme.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ $candy-app-theme: mat.define-light-theme((
2828
// Include the default theme styles.
2929
@include mat.all-component-themes($candy-app-theme);
3030
@include mat.all-legacy-component-themes($candy-app-theme);
31-
@include experimental.all-mdc-component-themes($candy-app-theme);
3231
@include experimental.column-resize-theme($candy-app-theme);
3332
@include experimental.popover-edit-theme($candy-app-theme);
3433

@@ -53,7 +52,6 @@ $candy-app-theme: mat.define-light-theme((
5352
// Include the dark theme color styles.
5453
@include mat.all-component-colors($dark-colors);
5554
@include mat.all-legacy-component-colors($dark-colors);
56-
@include experimental.all-mdc-component-colors($dark-colors);
5755
@include experimental.column-resize-color($dark-colors);
5856
@include experimental.popover-edit-color($dark-colors);
5957

@@ -71,6 +69,5 @@ $density-scales: (-1, -2, minimum, maximum);
7169
.demo-density-#{$density} {
7270
@include mat.private-all-component-densities($density);
7371
@include mat.private-all-legacy-component-densities($density);
74-
@include experimental.all-mdc-component-densities($density);
7572
}
7673
}

src/e2e-app/theme.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as experimental;
32

43
// Plus imports for other components in your app.
54

65
// Include the common styles for Angular Material. We include this here so that you only
76
// have to load a single css file for Angular Material in your app.
87
// **Be sure that you only ever include this mixin once!**
98
@include mat.core();
10-
@include experimental.all-mdc-component-typographies();
119

1210
// Define the default theme (same as the example above).
1311
$candy-app-primary: mat.define-palette(mat.$indigo-palette);
1412
$candy-app-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
15-
$candy-app-theme: mat.define-light-theme($candy-app-primary, $candy-app-accent);
13+
$candy-app-theme: mat.define-light-theme((
14+
color: (primary: $candy-app-primary, accent: $candy-app-accent),
15+
typography: mat.define-typography-config(),
16+
density: 0
17+
));
1618

1719
// Include the default theme styles.
1820
@include mat.all-component-themes($candy-app-theme);
1921
@include mat.all-legacy-component-themes($candy-app-theme);
20-
@include experimental.all-mdc-component-themes($candy-app-theme);

src/material-experimental/BUILD.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ ts_library(
1919

2020
sass_library(
2121
name = "theming_scss_lib",
22-
srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS + [
23-
"//src/material-experimental/mdc-core/color",
24-
"//src/material-experimental/mdc-core/density",
25-
"//src/material/core:core_scss_lib",
26-
"//src/material-experimental/mdc-core/theming",
27-
"//src/material-experimental/mdc-core/typography",
28-
],
22+
srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS,
2923
)
3024

3125
sass_library(

src/material-experimental/_index.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
1-
// Theme bundles
2-
@forward './mdc-core/theming/all-theme' show all-mdc-component-themes;
3-
@forward './mdc-core/color/all-color' show all-mdc-component-colors;
4-
@forward './mdc-core/typography/all-typography' show all-mdc-component-typographies,
5-
define-mdc-typography-config;
6-
@forward './mdc-core/density/all-density' show all-mdc-component-densities;
7-
81
// Component themes
92
@forward './column-resize/column-resize-theme' as column-resize-* show column-resize-color,
103
column-resize-typography, column-resize-density, column-resize-theme;
114
@forward './popover-edit/popover-edit-theme' as popover-edit-* show popover-edit-color,
125
popover-edit-typography, popover-edit-density, popover-edit-theme;
136

14-
// MDC-related themes
15-
@forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
16-
mdc-core-density, mdc-core-typography;
17-
187
// Additional public APIs for individual components

src/material-experimental/config.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
entryPoints = [
22
"column-resize",
3-
"mdc-core",
43
"menubar",
54
"popover-edit",
65
"selection",

src/material-experimental/mdc-core/BUILD.bazel

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

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

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

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

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

src/material-experimental/mdc-core/color/BUILD.bazel

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

src/material-experimental/mdc-core/color/_all-color.import.scss

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

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

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

src/material-experimental/mdc-core/density/BUILD.bazel

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

src/material-experimental/mdc-core/density/_all-density.import.scss

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

src/material-experimental/mdc-core/density/_all-density.scss

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

src/material-experimental/mdc-core/index.ts

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

0 commit comments

Comments
 (0)