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

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

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

99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
11-
import {MatCommonModule} from '@angular/material/core';
11+
import {MatCommonModule} from '@angular/material-experimental/mdc-core';
1212
import {
1313
MatCard,
1414
MatCardActions,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ ng_module(
2323
module_name = "@angular/material-experimental/mdc-checkbox",
2424
deps = [
2525
"//src/cdk/coercion",
26+
"//src/material-experimental/mdc-core",
2627
"//src/material/checkbox",
27-
"//src/material/core",
2828
"@npm//@angular/animations",
2929
"@npm//@angular/common",
3030
"@npm//@angular/core",
@@ -66,8 +66,8 @@ ng_test_library(
6666
":mdc-checkbox",
6767
"//src/cdk/testing/private",
6868
"//src/cdk/testing/testbed",
69+
"//src/material-experimental/mdc-core",
6970
"//src/material/checkbox",
70-
"//src/material/core",
7171
"@npm//@angular/forms",
7272
"@npm//@angular/platform-browser",
7373
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
flushMicrotasks,
88
TestBed,
99
} from '@angular/core/testing';
10-
import {ThemePalette} from '@angular/material/core';
10+
import {ThemePalette} from '@angular/material-experimental/mdc-core';
1111
import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms';
1212
import {By} from '@angular/platform-browser';
1313
import {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
mixinDisabled,
3939
CanColor,
4040
CanDisable,
41-
} from '@angular/material/core';
41+
} from '@angular/material-experimental/mdc-core';
4242
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
4343
import {MDCCheckboxAdapter, MDCCheckboxFoundation} from '@material/checkbox';
4444
import {numbers} from '@material/ripple';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {_MatCheckboxRequiredValidatorModule} from '@angular/material/checkbox';
12-
import {MatCommonModule, MatRippleModule} from '@angular/material/core';
12+
import {MatCommonModule, MatRippleModule} from '@angular/material-experimental/mdc-core';
1313
import {MatCheckbox} from './checkbox';
1414

1515
@NgModule({

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ng_module(
2121
module_name = "@angular/material-experimental/mdc-chips",
2222
deps = [
2323
"//src:dev_mode_types",
24-
"//src/material/core",
24+
"//src/material-experimental/mdc-core",
2525
"//src/material/form-field",
2626
"@npm//@angular/animations",
2727
"@npm//@angular/common",
@@ -68,7 +68,7 @@ ng_test_library(
6868
"//src/cdk/platform",
6969
"//src/cdk/testing",
7070
"//src/cdk/testing/private",
71-
"//src/material/core",
71+
"//src/material-experimental/mdc-core",
7272
"//src/material/form-field",
7373
"//src/material/input",
7474
"@npm//@angular/animations",

src/material-experimental/mdc-chips/chip-grid.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
CanUpdateErrorStateCtor,
3434
ErrorStateMatcher,
3535
mixinErrorState,
36-
} from '@angular/material/core';
36+
} from '@angular/material-experimental/mdc-core';
3737
import {MatFormFieldControl} from '@angular/material/form-field';
3838
import {MatChipTextControl} from './chip-text-control';
3939
import {merge, Observable, Subscription} from 'rxjs';

src/material-experimental/mdc-chips/chip-icons.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
HasTabIndexCtor,
1616
mixinDisabled,
1717
mixinTabIndex,
18-
} from '@angular/material/core';
18+
} from '@angular/material-experimental/mdc-core';
1919
import {MDCChipTrailingActionAdapter, MDCChipTrailingActionFoundation} from '@material/chips';
2020
import {Subject} from 'rxjs';
2121

src/material-experimental/mdc-chips/chip-set.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
QueryList,
2323
ViewEncapsulation
2424
} from '@angular/core';
25-
import {HasTabIndex, HasTabIndexCtor, mixinTabIndex} from '@angular/material/core';
25+
import {HasTabIndex, HasTabIndexCtor, mixinTabIndex} from '@angular/material-experimental/mdc-core';
2626
import {MDCChipSetAdapter, MDCChipSetFoundation} from '@material/chips';
2727
import {merge, Observable, Subject, Subscription} from 'rxjs';
2828
import {startWith, takeUntil} from 'rxjs/operators';

src/material-experimental/mdc-chips/chip.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Directionality} from '@angular/cdk/bidi';
22
import {createFakeEvent} from '@angular/cdk/testing/private';
33
import {Component, DebugElement, ViewChild} from '@angular/core';
44
import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
5-
import {MatRipple} from '@angular/material/core';
5+
import {MatRipple} from '@angular/material-experimental/mdc-core';
66
import {By} from '@angular/platform-browser';
77
import {Subject} from 'rxjs';
88
import {MatChip, MatChipEvent, MatChipSet, MatChipsModule} from './index';

src/material-experimental/mdc-chips/chip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import {
4141
mixinDisableRipple,
4242
mixinTabIndex,
4343
RippleAnimationConfig,
44-
} from '@angular/material/core';
44+
} from '@angular/material-experimental/mdc-core';
4545
import {MDCChipAdapter, MDCChipFoundation} from '@material/chips';
4646
import {numbers} from '@material/ripple';
4747
import {SPACE, ENTER, hasModifierKey} from '@angular/cdk/keycodes';

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
import {ENTER} from '@angular/cdk/keycodes';
1010
import {CommonModule} from '@angular/common';
1111
import {NgModule} from '@angular/core';
12-
import {ErrorStateMatcher, MatCommonModule, MatRippleModule} from '@angular/material/core';
12+
import {
13+
ErrorStateMatcher,
14+
MatCommonModule,
15+
MatRippleModule,
16+
} from '@angular/material-experimental/mdc-core';
1317
import {MatChip, MatChipCssInternalOnly} from './chip';
1418
import {MAT_CHIPS_DEFAULT_OPTIONS, MatChipsDefaultOptions} from './chip-default-options';
1519
import {MatChipEditInput} from './chip-edit-input';

src/material-experimental/mdc-core/public-api.ts

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,60 @@
77
*/
88

99
export * from './option/index';
10+
export {
11+
AnimationCurves,
12+
AnimationDurations,
13+
CanColor,
14+
CanColorCtor,
15+
CanDisable,
16+
CanDisableCtor,
17+
CanDisableRipple,
18+
CanDisableRippleCtor,
19+
CanUpdateErrorState,
20+
CanUpdateErrorStateCtor,
21+
DateAdapter,
22+
defaultRippleAnimationConfig,
23+
ErrorStateMatcher,
24+
GranularSanityChecks,
25+
HasInitialized,
26+
HasInitializedCtor,
27+
HasTabIndex,
28+
HasTabIndexCtor,
29+
MAT_DATE_FORMATS,
30+
MAT_DATE_LOCALE,
31+
MAT_DATE_LOCALE_FACTORY,
32+
MAT_NATIVE_DATE_FORMATS,
33+
MAT_OPTGROUP,
34+
MAT_RIPPLE_GLOBAL_OPTIONS,
35+
MatCommonModule,
36+
MatDateFormats,
37+
MATERIAL_SANITY_CHECKS,
38+
MatLine,
39+
MatLineModule,
40+
MatNativeDateModule,
41+
MatPseudoCheckbox,
42+
MatPseudoCheckboxModule,
43+
MatPseudoCheckboxState,
44+
MatRipple,
45+
MatRippleModule,
46+
mixinColor,
47+
mixinDisabled,
48+
mixinDisableRipple,
49+
mixinErrorState,
50+
mixinInitialized,
51+
mixinTabIndex,
52+
NativeDateAdapter,
53+
NativeDateModule,
54+
RippleAnimationConfig,
55+
RippleConfig,
56+
RippleGlobalOptions,
57+
RippleRef,
58+
RippleRenderer,
59+
RippleState,
60+
RippleTarget,
61+
SanityChecks,
62+
setLines,
63+
ShowOnDirtyErrorStateMatcher,
64+
ThemePalette,
65+
VERSION
66+
} from '@angular/material/core';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ng_module(
2222
deps = [
2323
"//src/cdk/overlay",
2424
"//src/cdk/portal",
25-
"//src/material/core",
25+
"//src/material-experimental/mdc-core",
2626
"//src/material/dialog",
2727
"@npm//@material/dialog",
2828
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {OverlayModule} from '@angular/cdk/overlay';
1010
import {PortalModule} from '@angular/cdk/portal';
1111
import {NgModule} from '@angular/core';
12-
import {MatCommonModule} from '@angular/material/core';
12+
import {MatCommonModule} from '@angular/material-experimental/mdc-core';
1313
import {MAT_DIALOG_SCROLL_STRATEGY_PROVIDER, MatDialog} from './dialog';
1414
import {MatDialogContainer} from './dialog-container';
1515
import {

src/material-experimental/mdc-form-field/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ng_module(
2020
"//src/cdk/bidi",
2121
"//src/cdk/observers",
2222
"//src/cdk/platform",
23-
"//src/material/core",
23+
"//src/material-experimental/mdc-core",
2424
"//src/material/form-field",
2525
"@npm//@angular/forms",
2626
"@npm//@material/line-ripple",

src/material-experimental/mdc-form-field/form-field.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
ViewEncapsulation
2929
} from '@angular/core';
3030
import {NgControl} from '@angular/forms';
31-
import {ThemePalette} from '@angular/material/core';
31+
import {ThemePalette} from '@angular/material-experimental/mdc-core';
3232
import {
3333
getMatFormFieldDuplicatedHintError,
3434
getMatFormFieldMissingControlError,

src/material-experimental/mdc-form-field/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {ObserversModule} from '@angular/cdk/observers';
1010
import {CommonModule} from '@angular/common';
1111
import {NgModule} from '@angular/core';
12-
import {MatCommonModule} from '@angular/material/core';
12+
import {MatCommonModule} from '@angular/material-experimental/mdc-core';
1313
import {MatError} from './directives/error';
1414
import {MatFormFieldFloatingLabel} from './directives/floating-label';
1515
import {MatHint} from './directives/hint';

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ ng_module(
1919
assets = glob(["**/*.html"]),
2020
module_name = "@angular/material-experimental/mdc-input",
2121
deps = [
22+
"//src/material-experimental/mdc-core",
2223
"//src/material-experimental/mdc-form-field",
23-
"//src/material/core",
2424
"//src/material/input",
2525
"@npm//@angular/forms",
2626
"@npm//@material/textfield",
@@ -50,6 +50,7 @@ ng_test_library(
5050
":mdc-input",
5151
"//src/cdk/platform",
5252
"//src/cdk/testing/private",
53+
"//src/material-experimental/mdc-core",
5354
"//src/material-experimental/mdc-form-field",
5455
"//src/material/core",
5556
"@npm//@angular/forms",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
ErrorStateMatcher,
3333
ShowOnDirtyErrorStateMatcher,
3434
ThemePalette,
35-
} from '@angular/material/core';
35+
} from '@angular/material-experimental/mdc-core';
3636
import {By} from '@angular/platform-browser';
3737
import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
3838
import {MAT_INPUT_VALUE_ACCESSOR, MatInput, MatInputModule} from './index';

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

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

99
import {TextFieldModule} from '@angular/cdk/text-field';
1010
import {NgModule} from '@angular/core';
11-
import {MatCommonModule} from '@angular/material/core';
11+
import {MatCommonModule} from '@angular/material-experimental/mdc-core';
1212
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
1313
import {MatInput} from './input';
1414

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ ng_module(
2727
deps = [
2828
"//src:dev_mode_types",
2929
"//src/cdk/collections",
30+
"//src/material-experimental/mdc-core",
3031
"//src/material/divider",
3132
"@npm//@angular/core",
3233
"@npm//@angular/forms",
@@ -79,7 +80,7 @@ ng_test_library(
7980
"//src/cdk/keycodes",
8081
"//src/cdk/testing/private",
8182
"//src/cdk/testing/testbed",
82-
"//src/material/core",
83+
"//src/material-experimental/mdc-core",
8384
"@npm//@angular/forms",
8485
"@npm//@angular/platform-browser",
8586
"@npm//@material/list",

0 commit comments

Comments
 (0)