Skip to content

fix(material/core): Move remaining MDC core functionality out of experimental #25503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
/src/material/card/** @mmalerba
/src/material/checkbox/** @mmalerba
/src/material/chips/** @mmalerba @crisbeto
/src/material-experimental/mdc-core/** @crisbeto
/src/material/dialog/** @devversion
/src/material/form-field/** @devversion @mmalerba
/src/material/list/** @mmalerba @devversion
Expand Down
1 change: 0 additions & 1 deletion .ng-dev/commit-message.mts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ export const commitMessage: CommitMessageConfig = {
'material/button',
'material/card',
'material/checkbox',
'material-experimental/mdc-core',
'material/dialog',
'material/form-field',
'material/input',
Expand Down
9 changes: 6 additions & 3 deletions integration/yarn-pnp-compat/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
@use '@angular/material' as mat;
@use '@angular/material-experimental' as experimental;

$primary: mat.define-palette(mat.$blue-palette);
$accent: mat.define-palette(mat.$grey-palette);
$theme: mat.define-light-theme($primary, $accent);
$theme: mat.define-light-theme((
color: (primary: $primary, accent: $accent),
typography: mat.define-typography-config(),
density: 0
));

@include mat.core($theme);

@include mat.all-legacy-component-themes($theme);
@include mat.all-component-themes($theme);
@include experimental.all-mdc-component-themes($theme);

html,
body {
Expand Down
3 changes: 0 additions & 3 deletions src/dev-app/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ $candy-app-theme: mat.define-light-theme((
// Include the default theme styles.
@include mat.all-component-themes($candy-app-theme);
@include mat.all-legacy-component-themes($candy-app-theme);
@include experimental.all-mdc-component-themes($candy-app-theme);
@include experimental.column-resize-theme($candy-app-theme);
@include experimental.popover-edit-theme($candy-app-theme);

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

Expand All @@ -71,6 +69,5 @@ $density-scales: (-1, -2, minimum, maximum);
.demo-density-#{$density} {
@include mat.private-all-component-densities($density);
@include mat.private-all-legacy-component-densities($density);
@include experimental.all-mdc-component-densities($density);
}
}
9 changes: 5 additions & 4 deletions src/e2e-app/theme.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
@use '@angular/material' as mat;
@use '@angular/material-experimental' as experimental;

// Plus imports for other components in your app.

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

// Define the default theme (same as the example above).
$candy-app-primary: mat.define-palette(mat.$indigo-palette);
$candy-app-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
$candy-app-theme: mat.define-light-theme($candy-app-primary, $candy-app-accent);
$candy-app-theme: mat.define-light-theme((
color: (primary: $candy-app-primary, accent: $candy-app-accent),
typography: mat.define-typography-config(),
density: 0
));

// Include the default theme styles.
@include mat.all-component-themes($candy-app-theme);
@include mat.all-legacy-component-themes($candy-app-theme);
@include experimental.all-mdc-component-themes($candy-app-theme);
8 changes: 1 addition & 7 deletions src/material-experimental/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,7 @@ ts_library(

sass_library(
name = "theming_scss_lib",
srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS + [
"//src/material-experimental/mdc-core/color",
"//src/material-experimental/mdc-core/density",
"//src/material/core:core_scss_lib",
"//src/material-experimental/mdc-core/theming",
"//src/material-experimental/mdc-core/typography",
],
srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS,
)

sass_library(
Expand Down
11 changes: 0 additions & 11 deletions src/material-experimental/_index.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
// Theme bundles
@forward './mdc-core/theming/all-theme' show all-mdc-component-themes;
@forward './mdc-core/color/all-color' show all-mdc-component-colors;
@forward './mdc-core/typography/all-typography' show all-mdc-component-typographies,
define-mdc-typography-config;
@forward './mdc-core/density/all-density' show all-mdc-component-densities;

// Component themes
@forward './column-resize/column-resize-theme' as column-resize-* show column-resize-color,
column-resize-typography, column-resize-density, column-resize-theme;
@forward './popover-edit/popover-edit-theme' as popover-edit-* show popover-edit-color,
popover-edit-typography, popover-edit-density, popover-edit-theme;

// MDC-related themes
@forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
mdc-core-density, mdc-core-typography;

// Additional public APIs for individual components
1 change: 0 additions & 1 deletion src/material-experimental/config.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
entryPoints = [
"column-resize",
"mdc-core",
"menubar",
"popover-edit",
"selection",
Expand Down
31 changes: 0 additions & 31 deletions src/material-experimental/mdc-core/BUILD.bazel

This file was deleted.

8 changes: 0 additions & 8 deletions src/material-experimental/mdc-core/_core-theme.import.scss

This file was deleted.

73 changes: 0 additions & 73 deletions src/material-experimental/mdc-core/_core-theme.scss

This file was deleted.

17 changes: 0 additions & 17 deletions src/material-experimental/mdc-core/color/BUILD.bazel

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions src/material-experimental/mdc-core/color/_all-color.scss

This file was deleted.

17 changes: 0 additions & 17 deletions src/material-experimental/mdc-core/density/BUILD.bazel

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions src/material-experimental/mdc-core/density/_all-density.scss

This file was deleted.

9 changes: 0 additions & 9 deletions src/material-experimental/mdc-core/index.ts

This file was deleted.

Loading