feat(material/core): switch option implementation to use MDC

Switches the implementation of `mat-option` and `mat-optgroup` to use MDC by default.

Author: crisbeto

src/material-experimental/_index.scss

@@ -17,10 +17,6 @@
 // MDC-related themes
 @forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
   mdc-core-density, mdc-core-typography;
-@forward './mdc-core/option/option-theme' as mdc-option-* show mdc-option-color,
-  mdc-option-typography, mdc-option-density, mdc-option-theme;
-@forward './mdc-core/option/optgroup-theme' as mdc-optgroup-* show mdc-optgroup-color,
-  mdc-optgroup-typography, mdc-optgroup-density, mdc-optgroup-theme;
 @forward './mdc-autocomplete/autocomplete-theme' as mdc-autocomplete-* show mdc-autocomplete-color,
   mdc-autocomplete-typography, mdc-autocomplete-density, mdc-autocomplete-theme;
 @forward './mdc-button/button-theme' as mdc-button-* show mdc-button-color, mdc-button-typography,

src/material-experimental/config.bzl

@@ -8,8 +8,6 @@ entryPoints = [
     "mdc-checkbox/testing",
     "mdc-chips",
     "mdc-chips/testing",
-    "mdc-core",
-    "mdc-core/testing",
     "mdc-dialog",
     "mdc-dialog/testing",
     "mdc-list",

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

@@ -16,7 +16,7 @@ ng_module(
     deps = [
         "//src/cdk/overlay",
         "//src/cdk/scrolling",
-        "//src/material-experimental/mdc-core",
+        "//src/material/core",
         "//src/material/autocomplete",
         "@npm//@angular/common",
     ],
@@ -58,7 +58,7 @@ ng_test_library(
         "//src/cdk/platform",
         "//src/cdk/scrolling",
         "//src/cdk/testing/private",
-        "//src/material-experimental/mdc-core",
+        "//src/material/core",
         "//src/material/form-field",
         "//src/material/input",
         "@npm//@angular/forms",

src/material-experimental/mdc-autocomplete/autocomplete-trigger.ts

@@ -9,10 +9,7 @@
 import {Directive, forwardRef} from '@angular/core';
 import {NG_VALUE_ACCESSOR} from '@angular/forms';
 import {_MatAutocompleteTriggerBase} from '@angular/material/autocomplete';
-import {
-  _countGroupLabelsBeforeOption,
-  _getOptionScrollPosition,
-} from '@angular/material-experimental/mdc-core';
+import {_countGroupLabelsBeforeOption, _getOptionScrollPosition} from '@angular/material/core';
 
 /**
  * Provider that allows the autocomplete to register as a ControlValueAccessor.

src/material-experimental/mdc-autocomplete/autocomplete.spec.ts

@@ -36,7 +36,7 @@ import {
   tick,
 } from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatOption, MatOptionSelectionChange} from '@angular/material-experimental/mdc-core';
+import {MatOption, MatOptionSelectionChange} from '@angular/material/core';
 import {MatFormField, MatFormFieldModule} from '@angular/material/form-field';
 import {MatInputModule} from '@angular/material/input';
 import {By} from '@angular/platform-browser';

src/material-experimental/mdc-autocomplete/autocomplete.ts

@@ -18,7 +18,7 @@ import {
   MAT_OPTION_PARENT_COMPONENT,
   MatOptgroup,
   MatOption,
-} from '@angular/material-experimental/mdc-core';
+} from '@angular/material/core';
 import {_MatAutocompleteBase} from '@angular/material/autocomplete';
 import {panelAnimation} from './animations';
 

src/material-experimental/mdc-autocomplete/module.ts

@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatOptionModule} from '@angular/material-experimental/mdc-core';
+import {MatCommonModule, MatOptionModule} from '@angular/material/core';
 import {CommonModule} from '@angular/common';
 import {CdkScrollableModule} from '@angular/cdk/scrolling';
 import {OverlayModule} from '@angular/cdk/overlay';

src/material-experimental/mdc-autocomplete/testing/BUILD.bazel

@@ -10,7 +10,7 @@ ts_library(
     ),
     deps = [
         "//src/cdk/testing",
-        "//src/material-experimental/mdc-core/testing",
+        "//src/material/core/testing",
         "//src/material/autocomplete/testing",
     ],
 )

src/material-experimental/mdc-autocomplete/testing/autocomplete-harness.ts

@@ -12,7 +12,7 @@ import {
   MatOptionHarness,
   OptgroupHarnessFilters,
   OptionHarnessFilters,
-} from '@angular/material-experimental/mdc-core/testing';
+} from '@angular/material/core/testing';
 import {_MatAutocompleteHarnessBase} from '@angular/material/autocomplete/testing';
 import {AutocompleteHarnessFilters} from './autocomplete-harness-filters';
 

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

@@ -15,10 +15,7 @@ ng_module(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    assets = [
-        ":option/option.css",
-        ":option/optgroup.css",
-    ] + glob(["**/*.html"]),
+    assets = glob(["**/*.html"]),
     deps = [
         "//src/material/core",
         "@npm//@angular/common",
@@ -36,26 +33,6 @@ sass_library(
     ],
 )
 
-sass_binary(
-    name = "option_scss",
-    src = "option/option.scss",
-    deps = [
-        "//:mdc_sass_lib",
-        "//src/material:sass_lib",
-        "//src/material/core:core_scss_lib",
-    ],
-)
-
-sass_binary(
-    name = "optgroup_scss",
-    src = "option/optgroup.scss",
-    deps = [
-        "//:mdc_sass_lib",
-        "//src/material:sass_lib",
-        "//src/material/core:core_scss_lib",
-    ],
-)
-
 #################
 #  Test targets
 #################

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

@@ -1,17 +1,12 @@
 @use 'sass:map';
 @use '@angular/material' as mat;
 
-@use './option/option-theme';
-@use './option/optgroup-theme';
 @use './elevation';
 
 
 @mixin color($config-or-theme) {
   $config: mat.get-color-config($config-or-theme);
 
-  @include option-theme.color($config);
-  @include optgroup-theme.color($config);
-
   @if $config != null {
     // Provides external CSS classes for each elevation value. Each CSS class is formatted as
     // `mat-mdc-elevation-z$zValue` where `$zValue` corresponds to the z-space to which the
@@ -41,16 +36,10 @@
 @mixin typography($config-or-theme) {
   $config: mat.private-typography-to-2018-config(
     mat.get-typography-config($config-or-theme));
-
-  @include option-theme.typography($config-or-theme);
-  @include optgroup-theme.typography($config-or-theme);
 }
 
 @mixin density($config-or-theme) {
   $density-scale: mat.get-density-config($config-or-theme);
-
-  @include option-theme.density($density-scale);
-  @include optgroup-theme.density($density-scale);
 }
 
 // Mixin that renders all of the core styles that depend on the theme.