Skip to content

Commit 4f77679

Browse files
authored
fix(material-experimental/mdc-core): expose same symbols as material/core (#20664)
Re-exports all the symbols from `material/core` in `material-experimental/mdc-core` so that it's easier to switch between the two. Also switches all imports under `material-experimental` to use `mdc-core`.
1 parent 58341a7 commit 4f77679

Some content is hidden

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

72 files changed

+157
-79
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ ng_module(
1919
"//src/cdk/scrolling",
2020
"//src/material-experimental/mdc-core",
2121
"//src/material/autocomplete",
22-
"//src/material/core",
2322
"@npm//@angular/common",
2423
],
2524
)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
import {Directive, forwardRef} from '@angular/core';
1010
import {NG_VALUE_ACCESSOR} from '@angular/forms';
1111
import {_MatAutocompleteTriggerBase} from '@angular/material/autocomplete';
12-
import {_countGroupLabelsBeforeOption, _getOptionScrollPosition} from '@angular/material/core';
12+
import {
13+
_countGroupLabelsBeforeOption,
14+
_getOptionScrollPosition,
15+
} from '@angular/material-experimental/mdc-core';
1316

1417
/**
1518
* Provider that allows the autocomplete to register as a ControlValueAccessor.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import {
1313
ContentChildren,
1414
QueryList,
1515
} from '@angular/core';
16-
import {MAT_OPTGROUP} from '@angular/material/core';
1716
import {_MatAutocompleteBase} from '@angular/material/autocomplete';
1817
import {
1918
MAT_OPTION_PARENT_COMPONENT,
19+
MAT_OPTGROUP,
2020
MatOptgroup,
2121
MatOption,
2222
} from '@angular/material-experimental/mdc-core';

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatCommonModule} from '@angular/material/core';
11-
import {MatOptionModule} from '@angular/material-experimental/mdc-core';
10+
import {MatCommonModule, MatOptionModule} from '@angular/material-experimental/mdc-core';
1211
import {CommonModule} from '@angular/common';
1312
import {CdkScrollableModule} from '@angular/cdk/scrolling';
1413
import {OverlayModule} from '@angular/cdk/overlay';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ng_module(
2727
module_name = "@angular/material-experimental/mdc-button",
2828
deps = [
2929
"//src/cdk/platform",
30-
"//src/material/core",
30+
"//src/material-experimental/mdc-core",
3131
"@npm//@material/ripple",
3232
],
3333
)
@@ -97,8 +97,8 @@ ng_test_library(
9797
deps = [
9898
":mdc-button",
9999
"//src/cdk/platform",
100+
"//src/material-experimental/mdc-core",
100101
"//src/material/button",
101-
"//src/material/core",
102102
"@npm//@angular/platform-browser",
103103
],
104104
)

src/material-experimental/mdc-button/button-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
mixinDisabled,
2222
mixinDisableRipple,
2323
RippleAnimationConfig
24-
} from '@angular/material/core';
24+
} from '@angular/material-experimental/mdc-core';
2525
import {numbers} from '@material/ripple';
2626
import {FocusOrigin} from '@angular/cdk/a11y';
2727

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
22
import {Component, DebugElement} from '@angular/core';
33
import {By} from '@angular/platform-browser';
44
import {MatButtonModule, MatButton} from './index';
5-
import {MatRipple, ThemePalette} from '@angular/material/core';
5+
import {MatRipple, ThemePalette} from '@angular/material-experimental/mdc-core';
66

77

88
describe('MDC-based MatButton', () => {

src/material-experimental/mdc-button/fab.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
MAT_BUTTON_INPUTS,
2727
MatButtonBase
2828
} from './button-base';
29-
import {ThemePalette} from '@angular/material/core';
29+
import {ThemePalette} from '@angular/material-experimental/mdc-core';
3030

3131
/**
3232
* Material Design floating action button (FAB) component. These buttons represent the primary

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatCommonModule, MatRippleModule} from '@angular/material/core';
10+
import {MatCommonModule, MatRippleModule} from '@angular/material-experimental/mdc-core';
1111
import {MatAnchor, MatButton} from './button';
1212
import {MatFabAnchor, MatFabButton} from './fab';
1313
import {MatIconAnchor, MatIconButton} from './icon-button';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ng_module(
1212
assets = [":card_scss"] + glob(["**/*.html"]),
1313
module_name = "@angular/material-experimental/mdc-card",
1414
deps = [
15-
"//src/material/core",
15+
"//src/material-experimental/mdc-core",
1616
],
1717
)
1818

0 commit comments

Comments
 (0)