diff --git a/package-lock.json b/package-lock.json index 4d90745db73c..d2159d5291ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,85 +5,108 @@ "requires": true, "dependencies": { "@angular/animations": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.6.tgz", - "integrity": "sha1-v5KD7HyMmLMvVp2E3NoQiQ/cAmI=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.4.0-RC.0.tgz", + "integrity": "sha1-z9WTfOEeq6A64+vXeLCHG3dTlmU=", "requires": { "tslib": "1.7.1" } }, "@angular/common": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.6.tgz", - "integrity": "sha1-7TfpMHx1Bt2DR5fBps9nXlK1tu4=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.4.0-RC.0.tgz", + "integrity": "sha1-rS0IU6YtLoe7oL3WWI2m+l8tq7g=", "requires": { "tslib": "1.7.1" } }, "@angular/compiler": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.6.tgz", - "integrity": "sha1-vhcN8Ji3HoNczt8WjV+3sj5QRbg=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.4.0-RC.0.tgz", + "integrity": "sha1-oiqet9DP0EwBVYtLb/FE5PIENO4=", "requires": { "tslib": "1.7.1" } }, "@angular/compiler-cli": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.3.6.tgz", - "integrity": "sha1-avpq72jdaB5hs5i+TWJw5choCxI=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-4.4.0-RC.0.tgz", + "integrity": "sha1-0trwhngqKAIQBVoiH2DRYrT+Yno=", "dev": true, "requires": { "@angular/tsc-wrapped": "4.3.6", "minimist": "1.2.0", "reflect-metadata": "0.1.10" + }, + "dependencies": { + "@angular/tsc-wrapped": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz", + "integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=", + "dev": true, + "requires": { + "tsickle": "0.21.6" + } + }, + "tsickle": { + "version": "0.21.6", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.6.tgz", + "integrity": "sha1-U7Abl5xcE/2xOvs/uVgXflmRWI0=", + "dev": true, + "requires": { + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "source-map": "0.5.6", + "source-map-support": "0.4.15" + } + } } }, "@angular/core": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.6.tgz", - "integrity": "sha1-u6xj1o0Pe8s4nRKzQghlK+MofpY=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.4.0-RC.0.tgz", + "integrity": "sha1-bxsF1Y2+guLNMpzT3AZm82xgw48=", "requires": { "tslib": "1.7.1" } }, "@angular/forms": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.6.tgz", - "integrity": "sha1-DyDEWXwWoVJ0XXzZVVmFWgpcZoc=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.4.0-RC.0.tgz", + "integrity": "sha1-LG1b231G/m6wQW4WGWK0JyZcP3s=", "requires": { "tslib": "1.7.1" } }, "@angular/http": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.6.tgz", - "integrity": "sha1-Vjgn0afV6J47fYa3f7vTZ7LAhZE=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.4.0-RC.0.tgz", + "integrity": "sha1-a6qUX6OhgqbOgqFRr2X8FIn14bE=", "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.6.tgz", - "integrity": "sha1-YVKx87eNAkb8XhUOL3ue1DN+O6Y=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.4.0-RC.0.tgz", + "integrity": "sha1-t8W4tjiFZMdLBRD4dQ4tdJJBPO4=", "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser-dynamic": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.6.tgz", - "integrity": "sha1-nqv4JvEZyY+Fwqlu3LGKsAtO+xw=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.0-RC.0.tgz", + "integrity": "sha1-dP6kqPvYljMgnyrwygpxp6Vp2DU=", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/platform-server": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.3.6.tgz", - "integrity": "sha1-Np1JhE8cCpoQx8upsMt4wlIHQaU=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-4.4.0-RC.0.tgz", + "integrity": "sha1-Dch10TyFEwqBVSJp3hHBmreDytM=", "dev": true, "requires": { "parse5": "3.0.2", @@ -92,18 +115,18 @@ } }, "@angular/router": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.6.tgz", - "integrity": "sha1-ZAM+20/NoIoyPnUztKGCDA8o0TA=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.4.0-RC.0.tgz", + "integrity": "sha1-72wHXxZkqf5nf6VCM0cH5nBGHuA=", "dev": true, "requires": { "tslib": "1.7.1" } }, "@angular/tsc-wrapped": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.3.6.tgz", - "integrity": "sha1-GqZuCrLEeZpK0UtnXhOVOqX81DY=", + "version": "4.4.0-RC.0", + "resolved": "https://registry.npmjs.org/@angular/tsc-wrapped/-/tsc-wrapped-4.4.0-RC.0.tgz", + "integrity": "sha1-xXZeYDDjQzHowAfF0RYotfCxi3I=", "dev": true, "requires": { "tsickle": "0.21.6" @@ -7870,9 +7893,9 @@ } }, "gulp-highlight-files": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/gulp-highlight-files/-/gulp-highlight-files-0.0.4.tgz", - "integrity": "sha1-jP1kIJ5TysUs17j2qLXZ6nl5UXI=", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/gulp-highlight-files/-/gulp-highlight-files-0.0.5.tgz", + "integrity": "sha512-lGLApyg6ycB45MWsLx9WbsAv0iTPxGTUH+Lq8evAXUXCFBPITG2JmLxQ3OYWA1/AOItDeAX5yza1HdLlaIXIPA==", "dev": true, "requires": { "gulp-util": "3.0.8", diff --git a/package.json b/package.json index d3fd943722ee..336a38a8d2d6 100644 --- a/package.json +++ b/package.json @@ -25,13 +25,13 @@ "node": ">= 5.4.1" }, "dependencies": { - "@angular/animations": "~4.3.6", - "@angular/common": "~4.3.6", - "@angular/compiler": "~4.3.6", - "@angular/core": "~4.3.6", - "@angular/forms": "~4.3.6", - "@angular/http": "~4.3.6", - "@angular/platform-browser": "~4.3.6", + "@angular/animations": "~4.4.0-RC.0", + "@angular/common": "~4.4.0-RC.0", + "@angular/compiler": "~4.4.0-RC.0", + "@angular/core": "~4.4.0-RC.0", + "@angular/forms": "~4.4.0-RC.0", + "@angular/http": "~4.4.0-RC.0", + "@angular/platform-browser": "~4.4.0-RC.0", "core-js": "^2.4.1", "rxjs": "^5.0.1", "systemjs": "0.19.43", @@ -40,11 +40,11 @@ "zone.js": "^0.8.12" }, "devDependencies": { - "@angular/compiler-cli": "~4.3.6", - "@angular/platform-browser-dynamic": "~4.3.6", - "@angular/platform-server": "~4.3.6", - "@angular/router": "~4.3.6", - "@angular/tsc-wrapped": "~4.3.6", + "@angular/compiler-cli": "~4.4.0-RC.0", + "@angular/platform-browser-dynamic": "~4.4.0-RC.0", + "@angular/platform-server": "~4.4.0-RC.0", + "@angular/router": "~4.4.0-RC.0", + "@angular/tsc-wrapped": "~4.4.0-RC.0", "@google-cloud/storage": "^1.1.1", "@types/chalk": "^0.4.31", "@types/fs-extra": "^3.0.1", diff --git a/src/lib/autocomplete/autocomplete.ts b/src/lib/autocomplete/autocomplete.ts index b8c7885d1b1c..e9041dee1533 100644 --- a/src/lib/autocomplete/autocomplete.ts +++ b/src/lib/autocomplete/autocomplete.ts @@ -44,7 +44,7 @@ export class MdAutocompleteSelectedEvent { styleUrls: ['autocomplete.css'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, - exportAs: 'mdAutocomplete', + exportAs: 'mdAutocomplete, matAutocomplete', host: { 'class': 'mat-autocomplete' } diff --git a/src/lib/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts index daa882984084..740867820918 100644 --- a/src/lib/button-toggle/button-toggle.ts +++ b/src/lib/button-toggle/button-toggle.ts @@ -69,7 +69,7 @@ export class MdButtonToggleChange { 'class': 'mat-button-toggle-group', '[class.mat-button-toggle-vertical]': 'vertical' }, - exportAs: 'mdButtonToggleGroup', + exportAs: 'mdButtonToggleGroup, matButtonToggleGroup', }) export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase implements ControlValueAccessor, CanDisable { @@ -229,7 +229,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase /** Multiple selection button-toggle group. `ngModel` is not supported in this mode. */ @Directive({ selector: 'md-button-toggle-group[multiple], mat-button-toggle-group[multiple]', - exportAs: 'mdButtonToggleGroup', + exportAs: 'mdButtonToggleGroup, matButtonToggleGroup', inputs: ['disabled'], host: { 'class': 'mat-button-toggle-group', diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts index e2587427028e..bf8b784ec167 100644 --- a/src/lib/chips/chip-list.ts +++ b/src/lib/chips/chip-list.ts @@ -34,7 +34,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion'; moduleId: module.id, selector: 'md-chip-list, mat-chip-list', template: `
`, - exportAs: 'mdChipList', + exportAs: 'mdChipList, matChipList', host: { '[attr.tabindex]': '_tabIndex', 'role': 'listbox', diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts index 3a88bd516064..642a41ea7e19 100644 --- a/src/lib/chips/chip.ts +++ b/src/lib/chips/chip.ts @@ -59,7 +59,7 @@ export class MdBasicChip { } selector: `md-basic-chip, [md-basic-chip], md-chip, [md-chip], mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]`, inputs: ['color', 'disabled'], - exportAs: 'mdChip', + exportAs: 'mdChip, matChip', host: { 'class': 'mat-chip', 'tabindex': '-1', diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts index e8c27b65e6d3..c232ec2fb02e 100644 --- a/src/lib/core/ripple/ripple.ts +++ b/src/lib/core/ripple/ripple.ts @@ -34,7 +34,7 @@ export const MD_RIPPLE_GLOBAL_OPTIONS = @Directive({ selector: '[md-ripple], [mat-ripple], [mdRipple], [matRipple]', - exportAs: 'mdRipple', + exportAs: 'mdRipple, matRipple', host: { 'class': 'mat-ripple', '[class.mat-ripple-unbounded]': 'unbounded' diff --git a/src/lib/datepicker/datepicker-input.ts b/src/lib/datepicker/datepicker-input.ts index ab16cdf850b4..ee97403108b7 100644 --- a/src/lib/datepicker/datepicker-input.ts +++ b/src/lib/datepicker/datepicker-input.ts @@ -82,7 +82,7 @@ export class MdDatepickerInputEvent { '(blur)': '_onTouched()', '(keydown)': '_onKeydown($event)', }, - exportAs: 'mdDatepickerInput', + exportAs: 'mdDatepickerInput, matDatepickerInput', }) export class MdDatepickerInput implements AfterContentInit, ControlValueAccessor, OnDestroy, Validator { diff --git a/src/lib/input/autosize.ts b/src/lib/input/autosize.ts index ecb135b8ce7b..1bc338021849 100644 --- a/src/lib/input/autosize.ts +++ b/src/lib/input/autosize.ts @@ -16,7 +16,7 @@ import {Platform} from '@angular/cdk/platform'; @Directive({ selector: `textarea[md-autosize], textarea[mdTextareaAutosize], textarea[mat-autosize], textarea[matTextareaAutosize]`, - exportAs: 'mdTextareaAutosize', + exportAs: 'mdTextareaAutosize, matTextareaAutosize', host: { // Textarea elements that have the directive applied should have a single row by default. // Browsers normally show two rows by default and therefore this limits the minRows binding. diff --git a/src/lib/mat-exports.ts b/src/lib/mat-exports.ts new file mode 100644 index 000000000000..9afb2175f3a2 --- /dev/null +++ b/src/lib/mat-exports.ts @@ -0,0 +1,527 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import { + MD_AUTOCOMPLETE_SCROLL_STRATEGY, + MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER, + MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY, + MD_AUTOCOMPLETE_VALUE_ACCESSOR, + MdAutocomplete, + MdAutocompleteModule, + MdAutocompleteTrigger, +} from '@angular/material/autocomplete'; +import { + MdAnchor, + MdButton, + MdButtonBase, + MdButtonCssMatStyler, + MdButtonModule, + MdFab, + MdIconButtonCssMatStyler, + MdMiniFab, + MdRaisedButtonCssMatStyler, +} from '@angular/material/button'; +import { + MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR, + MdButtonToggle, + MdButtonToggleChange, + MdButtonToggleGroup, + MdButtonToggleGroupBase, + MdButtonToggleGroupMultiple, + MdButtonToggleModule, +} from '@angular/material/button-toggle'; +import { + MdCard, + MdCardActions, + MdCardAvatar, + MdCardContent, + MdCardFooter, + MdCardHeader, + MdCardImage, + MdCardLgImage, + MdCardMdImage, + MdCardModule, + MdCardSmImage, + MdCardSubtitle, + MdCardTitle, + MdCardTitleGroup, + MdCardXlImage, +} from '@angular/material/card'; +import { + MD_CHECKBOX_CONTROL_VALUE_ACCESSOR, + MD_CHECKBOX_REQUIRED_VALIDATOR, + MdCheckbox, + MdCheckboxBase, + MdCheckboxChange, + MdCheckboxModule, + MdCheckboxRequiredValidator, +} from '@angular/material/checkbox'; +import { + MdBasicChip, + MdChip, + MdChipBase, + MdChipEvent, + MdChipInput, + MdChipInputEvent, + MdChipList, + MdChipRemove, + MdChipsModule, +} from '@angular/material/chips'; +import { + MD_DATE_FORMATS, + MD_ERROR_GLOBAL_OPTIONS, + MD_NATIVE_DATE_FORMATS, + MD_PLACEHOLDER_GLOBAL_OPTIONS, + MD_RIPPLE_GLOBAL_OPTIONS, + MdCommonModule, + MdDateFormats, + MdLine, + MdLineModule, + MdLineSetter, + MdNativeDateModule, + MdOptgroup, + MdOptgroupBase, + MdOption, + MdOptionModule, + MdOptionSelectionChange, + MdPseudoCheckbox, + MdPseudoCheckboxModule, + MdPseudoCheckboxState, + MdRipple, + MdRippleModule, +} from '@angular/material/core'; +import { + MD_DATEPICKER_SCROLL_STRATEGY, + MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER, + MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY, + MD_DATEPICKER_VALIDATORS, + MD_DATEPICKER_VALUE_ACCESSOR, + MdCalendar, + MdCalendarBody, + MdCalendarCell, + MdDatepicker, + MdDatepickerContent, + MdDatepickerInput, + MdDatepickerInputEvent, + MdDatepickerIntl, + MdDatepickerModule, + MdDatepickerToggle, + MdMonthView, + MdYearView, +} from '@angular/material/datepicker'; +import { + MD_DIALOG_DATA, + MD_DIALOG_SCROLL_STRATEGY, + MD_DIALOG_SCROLL_STRATEGY_PROVIDER, + MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY, + MdDialog, + MdDialogActions, + MdDialogClose, + MdDialogConfig, + MdDialogContainer, + MdDialogContent, + MdDialogModule, + MdDialogRef, + MdDialogTitle, +} from '@angular/material/dialog'; +import { + MdAccordion, + MdAccordionDisplayMode, + MdExpansionModule, + MdExpansionPanel, + MdExpansionPanelActionRow, + MdExpansionPanelDescription, + MdExpansionPanelHeader, + MdExpansionPanelState, + MdExpansionPanelTitle, +} from '@angular/material/expansion'; +import { + MdError, + MdFormField, + MdFormFieldControl, + MdFormFieldModule, + MdHint, + MdPlaceholder, + MdPrefix, + MdSuffix, +} from '@angular/material/form-field'; +import {MdGridList, MdGridListModule, MdGridTile} from '@angular/material/grid-list'; +import {MdIcon, MdIconBase, MdIconModule, MdIconRegistry} from '@angular/material/icon'; +import {MdInput, MdInputModule, MdTextareaAutosize} from '@angular/material/input'; +import { + MdDividerCssMatStyler, + MdList, + MdListAvatarCssMatStyler, + MdListBase, + MdListCssMatStyler, + MdListDivider, + MdListIconCssMatStyler, + MdListItem, + MdListItemBase, + MdListModule, + MdListOption, + MdListOptionBase, + MdListSubheaderCssMatStyler, + MdNavListCssMatStyler, + MdSelectionList, + MdSelectionListBase, + MdSelectionListOptionEvent, +} from '@angular/material/list'; +import { + MD_MENU_DEFAULT_OPTIONS, + MdMenu, + MdMenuDefaultOptions, + MdMenuItem, + MdMenuModule, + MdMenuPanel, + MdMenuTrigger, +} from '@angular/material/menu'; +import {MdPaginator, MdPaginatorIntl, MdPaginatorModule} from '@angular/material/paginator'; +import {MdProgressBar, MdProgressBarModule} from '@angular/material/progress-bar'; +import { + MdProgressSpinner, + MdProgressSpinnerBase, + MdProgressSpinnerCssMatStyler, + MdProgressSpinnerModule, + MdSpinner, +} from '@angular/material/progress-spinner'; +import { + MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR, + MdRadioButton, + MdRadioButtonBase, + MdRadioChange, + MdRadioGroup, + MdRadioGroupBase, + MdRadioModule, +} from '@angular/material/radio'; +import { + MD_SELECT_SCROLL_STRATEGY, + MD_SELECT_SCROLL_STRATEGY_PROVIDER, + MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY, + MdSelect, + MdSelectBase, + MdSelectChange, + MdSelectModule, + MdSelectTrigger, +} from '@angular/material/select'; +import { + MdDrawer, + MdDrawerContainer, + MdDrawerToggleResult, + MdSidenav, + MdSidenavContainer, + MdSidenavModule, +} from '@angular/material/sidenav'; +import { + MD_SLIDE_TOGGLE_VALUE_ACCESSOR, + MdSlideToggle, + MdSlideToggleBase, + MdSlideToggleChange, + MdSlideToggleModule, +} from '@angular/material/slide-toggle'; +import { + MD_SLIDER_VALUE_ACCESSOR, + MdSlider, + MdSliderBase, + MdSliderChange, + MdSliderModule, +} from '@angular/material/slider'; +import { + MD_SNACK_BAR_DATA, + MdSnackBar, + MdSnackBarConfig, + MdSnackBarContainer, + MdSnackBarModule, + MdSnackBarRef, +} from '@angular/material/snack-bar'; +import { + MdSort, + MdSortable, + MdSortHeader, + MdSortHeaderIntl, + MdSortModule, +} from '@angular/material/sort'; +import { + MdCell, + MdCellDef, + MdColumnDef, + MdHeaderCell, + MdHeaderCellDef, + MdHeaderRow, + MdRow, + MdTable, + MdTableModule, +} from '@angular/material/table'; +import { + MdInkBar, + MdTab, + MdTabBody, + MdTabBodyOriginState, + MdTabBodyPositionState, + MdTabChangeEvent, + MdTabGroup, + MdTabGroupBase, + MdTabHeader, + MdTabHeaderPosition, + MdTabLabel, + MdTabLabelWrapper, + MdTabLink, + MdTabNav, + MdTabsModule, +} from '@angular/material/tabs'; +import {MdToolbar, MdToolbarBase, MdToolbarModule, MdToolbarRow} from '@angular/material/toolbar'; +import { + MD_TOOLTIP_SCROLL_STRATEGY, + MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER, + MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY, + MdTooltip, + MdTooltipModule, +} from '@angular/material/tooltip'; + +/* tslint:disable:max-line-length */ +export {MD_AUTOCOMPLETE_SCROLL_STRATEGY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY}; +export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER}; +export {MD_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_AUTOCOMPLETE_SCROLL_STRATEGY_PROVIDER_FACTORY}; +export {MD_AUTOCOMPLETE_VALUE_ACCESSOR as MAT_AUTOCOMPLETE_VALUE_ACCESSOR}; +export {MD_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR as MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR}; +export {MD_CHECKBOX_CONTROL_VALUE_ACCESSOR as MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR}; +export {MD_CHECKBOX_REQUIRED_VALIDATOR as MAT_CHECKBOX_REQUIRED_VALIDATOR}; +export {MD_DATE_FORMATS as MAT_DATE_FORMATS}; +export {MD_DATEPICKER_SCROLL_STRATEGY as MAT_DATEPICKER_SCROLL_STRATEGY}; +export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER}; +export {MD_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DATEPICKER_SCROLL_STRATEGY_PROVIDER_FACTORY}; +export {MD_DATEPICKER_VALIDATORS as MAT_DATEPICKER_VALIDATORS}; +export {MD_DATEPICKER_VALUE_ACCESSOR as MAT_DATEPICKER_VALUE_ACCESSOR}; +export {MD_DIALOG_DATA as MAT_DIALOG_DATA}; +export {MD_DIALOG_SCROLL_STRATEGY as MAT_DIALOG_SCROLL_STRATEGY}; +export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER}; +export {MD_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY}; +export {MD_ERROR_GLOBAL_OPTIONS as MAT_ERROR_GLOBAL_OPTIONS}; +export {MD_MENU_DEFAULT_OPTIONS as MAT_MENU_DEFAULT_OPTIONS}; +export {MD_NATIVE_DATE_FORMATS as MAT_NATIVE_DATE_FORMATS}; +export {MD_PLACEHOLDER_GLOBAL_OPTIONS as MAT_PLACEHOLDER_GLOBAL_OPTIONS}; +export {MD_RADIO_GROUP_CONTROL_VALUE_ACCESSOR as MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR}; +export {MD_RIPPLE_GLOBAL_OPTIONS as MAT_RIPPLE_GLOBAL_OPTIONS}; +export {MD_SELECT_SCROLL_STRATEGY as MAT_SELECT_SCROLL_STRATEGY}; +export {MD_SELECT_SCROLL_STRATEGY_PROVIDER as MAT_SELECT_SCROLL_STRATEGY_PROVIDER}; +export {MD_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY}; +export {MD_SLIDE_TOGGLE_VALUE_ACCESSOR as MAT_SLIDE_TOGGLE_VALUE_ACCESSOR}; +export {MD_SLIDER_VALUE_ACCESSOR as MAT_SLIDER_VALUE_ACCESSOR}; +export {MD_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA}; +export {MD_TOOLTIP_SCROLL_STRATEGY as MAT_TOOLTIP_SCROLL_STRATEGY}; +export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER}; +export {MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY as MAT_TOOLTIP_SCROLL_STRATEGY_PROVIDER_FACTORY}; +export {MdAccordion as MatAccordion}; +export {MdAccordionDisplayMode as MatAccordionDisplayMode}; +export {MdAnchor as MatAnchor}; +export {MdAutocomplete as MatAutocomplete}; +export {MdAutocompleteModule as MatAutocompleteModule}; +export {MdAutocompleteTrigger as MatAutocompleteTrigger}; +export {MdBasicChip as MatBasicChip}; +export {MdButton as MatButton}; +export {MdButtonBase as MatButtonBase}; +export {MdButtonCssMatStyler as MatButtonCssMatStyler}; +export {MdButtonModule as MatButtonModule}; +export {MdButtonToggle as MatButtonToggle}; +export {MdButtonToggleChange as MatButtonToggleChange}; +export {MdButtonToggleGroup as MatButtonToggleGroup}; +export {MdButtonToggleGroupBase as MatButtonToggleGroupBase}; +export {MdButtonToggleGroupMultiple as MatButtonToggleGroupMultiple}; +export {MdButtonToggleModule as MatButtonToggleModule}; +export {MdCalendar as MatCalendar}; +export {MdCalendarBody as MatCalendarBody}; +export {MdCalendarCell as MatCalendarCell}; +export {MdCard as MatCard}; +export {MdCardActions as MatCardActions}; +export {MdCardAvatar as MatCardAvatar}; +export {MdCardContent as MatCardContent}; +export {MdCardFooter as MatCardFooter}; +export {MdCardHeader as MatCardHeader}; +export {MdCardImage as MatCardImage}; +export {MdCardLgImage as MatCardLgImage}; +export {MdCardMdImage as MatCardMatImage}; +export {MdCardModule as MatCardModule}; +export {MdCardSmImage as MatCardSmImage}; +export {MdCardSubtitle as MatCardSubtitle}; +export {MdCardTitle as MatCardTitle}; +export {MdCardTitleGroup as MatCardTitleGroup}; +export {MdCardXlImage as MatCardXlImage}; +export {MdCell as MatCell}; +export {MdCellDef as MatCellDef}; +export {MdCheckbox as MatCheckbox}; +export {MdCheckboxBase as MatCheckboxBase}; +export {MdCheckboxChange as MatCheckboxChange}; +export {MdCheckboxModule as MatCheckboxModule}; +export {MdCheckboxRequiredValidator as MatCheckboxRequiredValidator}; +export {MdChip as MatChip}; +export {MdChipBase as MatChipBase}; +export {MdChipEvent as MatChipEvent}; +export {MdChipInput as MatChipInput}; +export {MdChipInputEvent as MatChipInputEvent}; +export {MdChipList as MatChipList}; +export {MdChipRemove as MatChipRemove}; +export {MdChipsModule as MatChipsModule}; +export {MdColumnDef as MatColumnDef}; +export {MdCommonModule as MatCommonModule}; +export {MdDateFormats as MatDateFormats}; +export {MdDatepicker as MatDatepicker}; +export {MdDatepickerContent as MatDatepickerContent}; +export {MdDatepickerInput as MatDatepickerInput}; +export {MdDatepickerInputEvent as MatDatepickerInputEvent}; +export {MdDatepickerIntl as MatDatepickerIntl}; +export {MdDatepickerModule as MatDatepickerModule}; +export {MdDatepickerToggle as MatDatepickerToggle}; +export {MdDialog as MatDialog}; +export {MdDialogActions as MatDialogActions}; +export {MdDialogClose as MatDialogClose}; +export {MdDialogConfig as MatDialogConfig}; +export {MdDialogContainer as MatDialogContainer}; +export {MdDialogContent as MatDialogContent}; +export {MdDialogModule as MatDialogModule}; +export {MdDialogRef as MatDialogRef}; +export {MdDialogTitle as MatDialogTitle}; +export {MdDividerCssMatStyler as MatDividerCssMatStyler}; +export {MdDrawerToggleResult as MatDrawerToggleResult}; +export {MdDrawer as MatDrawer}; +export {MdDrawerContainer as MatDrawerContainer}; +export {MdExpansionModule as MatExpansionModule}; +export {MdExpansionPanel as MatExpansionPanel}; +export {MdExpansionPanelActionRow as MatExpansionPanelActionRow}; +export {MdExpansionPanelDescription as MatExpansionPanelDescription}; +export {MdExpansionPanelHeader as MatExpansionPanelHeader}; +export {MdExpansionPanelState as MatExpansionPanelState}; +export {MdExpansionPanelTitle as MatExpansionPanelTitle}; +export {MdFab as MatFab}; +export {MdGridList as MatGridList}; +export {MdGridListModule as MatGridListModule}; +export {MdGridTile as MatGridTile}; +export {MdHeaderCell as MatHeaderCell}; +export {MdHeaderCellDef as MatHeaderCellDef}; +export {MdHeaderRow as MatHeaderRow}; +export {MdIcon as MatIcon}; +export {MdIconBase as MatIconBase}; +export {MdIconButtonCssMatStyler as MatIconButtonCssMatStyler}; +export {MdIconModule as MatIconModule}; +export {MdIconRegistry as MatIconRegistry}; +export {MdInkBar as MatInkBar}; +export {MdInput as MatInput}; +export {MdInputModule as MatInputModule}; +export {MdLine as MatLine}; +export {MdLineModule as MatLineModule}; +export {MdLineSetter as MatLineSetter}; +export {MdList as MatList}; +export {MdListAvatarCssMatStyler as MatListAvatarCssMatStyler}; +export {MdListBase as MatListBase}; +export {MdListCssMatStyler as MatListCssMatStyler}; +export {MdListDivider as MatListDivider}; +export {MdListIconCssMatStyler as MatListIconCssMatStyler}; +export {MdListItem as MatListItem}; +export {MdListItemBase as MatListItemBase}; +export {MdListModule as MatListModule}; +export {MdListOption as MatListOption}; +export {MdListOptionBase as MatListOptionBase}; +export {MdListSubheaderCssMatStyler as MatListSubheaderCssMatStyler}; +export {MdMenu as MatMenu}; +export {MdMenuDefaultOptions as MatMenuDefaultOptions}; +export {MdMenuItem as MatMenuItem}; +export {MdMenuModule as MatMenuModule}; +export {MdMenuPanel as MatMenuPanel}; +export {MdMenuTrigger as MatMenuTrigger}; +export {MdMiniFab as MatMiniFab}; +export {MdMonthView as MatMonthView}; +export {MdNativeDateModule as MatNativeDateModule}; +export {MdNavListCssMatStyler as MatNavListCssMatStyler}; +export {MdOptgroup as MatOptgroup}; +export {MdOptgroupBase as MatOptgroupBase}; +export {MdOption as MatOption}; +export {MdOptionModule as MatOptionModule}; +export {MdOptionSelectionChange as MatOptionSelectionChange}; +export {MdPaginator as MatPaginator}; +export {MdPaginatorIntl as MatPaginatorIntl}; +export {MdPaginatorModule as MatPaginatorModule}; +export {MdProgressBar as MatProgressBar}; +export {MdProgressBarModule as MatProgressBarModule}; +export {MdProgressSpinner as MatProgressSpinner}; +export {MdProgressSpinnerBase as MatProgressSpinnerBase}; +export {MdProgressSpinnerCssMatStyler as MatProgressSpinnerCssMatStyler}; +export {MdProgressSpinnerModule as MatProgressSpinnerModule}; +export {MdPseudoCheckbox as MatPseudoCheckbox}; +export {MdPseudoCheckboxModule as MatPseudoCheckboxModule}; +export {MdPseudoCheckboxState as MatPseudoCheckboxState}; +export {MdRadioButton as MatRadioButton}; +export {MdRadioButtonBase as MatRadioButtonBase}; +export {MdRadioChange as MatRadioChange}; +export {MdRadioGroup as MatRadioGroup}; +export {MdRadioGroupBase as MatRadioGroupBase}; +export {MdRadioModule as MatRadioModule}; +export {MdRaisedButtonCssMatStyler as MatRaisedButtonCssMatStyler}; +export {MdRipple as MatRipple}; +export {MdRippleModule as MatRippleModule}; +export {MdRow as MatRow}; +export {MdSelect as MatSelect}; +export {MdSelectBase as MatSelectBase}; +export {MdSelectChange as MatSelectChange}; +export {MdSelectionList as MatSelectionList}; +export {MdSelectionListBase as MatSelectionListBase}; +export {MdSelectionListOptionEvent as MatSelectionListOptionEvent}; +export {MdSelectModule as MatSelectModule}; +export {MdSelectTrigger as MatSelectTrigger}; +export {MdSidenav as MatSidenav}; +export {MdSidenavContainer as MatSidenavContainer}; +export {MdSidenavModule as MatSidenavModule}; +export {MdSlider as MatSlider}; +export {MdSliderBase as MatSliderBase}; +export {MdSliderChange as MatSliderChange}; +export {MdSliderModule as MatSliderModule}; +export {MdSlideToggle as MatSlideToggle}; +export {MdSlideToggleBase as MatSlideToggleBase}; +export {MdSlideToggleChange as MatSlideToggleChange}; +export {MdSlideToggleModule as MatSlideToggleModule}; +export {MdSnackBar as MatSnackBar}; +export {MdSnackBarConfig as MatSnackBarConfig}; +export {MdSnackBarContainer as MatSnackBarContainer}; +export {MdSnackBarModule as MatSnackBarModule}; +export {MdSnackBarRef as MatSnackBarRef}; +export {MdSort as MatSort}; +export {MdSortable as MatSortable}; +export {MdSortHeader as MatSortHeader}; +export {MdSortHeaderIntl as MatSortHeaderIntl}; +export {MdSortModule as MatSortModule}; +export {MdSpinner as MatSpinner}; +export {MdTab as MatTab}; +export {MdTabBody as MatTabBody}; +export {MdTabBodyOriginState as MatTabBodyOriginState}; +export {MdTabBodyPositionState as MatTabBodyPositionState}; +export {MdTabChangeEvent as MatTabChangeEvent}; +export {MdTabGroup as MatTabGroup}; +export {MdTabGroupBase as MatTabGroupBase}; +export {MdTabHeader as MatTabHeader}; +export {MdTabHeaderPosition as MatTabHeaderPosition}; +export {MdTabLabel as MatTabLabel}; +export {MdTabLabelWrapper as MatTabLabelWrapper}; +export {MdTable as MatTable}; +export {MdTableModule as MatTableModule}; +export {MdTabLink as MatTabLink}; +export {MdTabNav as MatTabNav}; +export {MdTabsModule as MatTabsModule}; +export {MdTextareaAutosize as MatTextareaAutosize}; +export {MdToolbar as MatToolbar}; +export {MdToolbarBase as MatToolbarBase}; +export {MdToolbarModule as MatToolbarModule}; +export {MdToolbarRow as MatToolbarRow}; +export {MdTooltip as MatTooltip}; +export {MdTooltipModule as MatTooltipModule}; +export {MdYearView as MatYearView}; +export {MdFormFieldModule as MatFormFieldModule}; +export {MdError as MatError}; +export {MdFormField as MatFormField}; +export {MdFormFieldControl as MatFormFieldControl}; +export {MdHint as MatHint}; +export {MdPlaceholder as MatPlaceholder}; +export {MdPrefix as MatPrefix}; +export {MdSuffix as MatSuffix}; diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts index fd3b53aefb96..a0745fe3baf5 100644 --- a/src/lib/menu/menu-item.ts +++ b/src/lib/menu/menu-item.ts @@ -44,7 +44,7 @@ export const _MdMenuItemMixinBase = mixinDisabled(MdMenuItemBase); changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, templateUrl: 'menu-item.html', - exportAs: 'mdMenuItem', + exportAs: 'mdMenuItem, matMenuItem', }) export class MdMenuItem extends _MdMenuItemMixinBase implements FocusableOption, CanDisable, OnDestroy { diff --git a/src/lib/public_api.ts b/src/lib/public_api.ts index 44c3e6a600e2..b38675d877ba 100644 --- a/src/lib/public_api.ts +++ b/src/lib/public_api.ts @@ -46,3 +46,4 @@ export * from '@angular/material/table'; export * from '@angular/material/tabs'; export * from '@angular/material/toolbar'; export * from '@angular/material/tooltip'; +export * from './mat-exports'; diff --git a/src/lib/select/select.ts b/src/lib/select/select.ts index 5ff27f2855a7..d7a20d8fc639 100644 --- a/src/lib/select/select.ts +++ b/src/lib/select/select.ts @@ -201,7 +201,7 @@ export class MdSelectTrigger {} transformPanel, fadeInContent ], - exportAs: 'mdSelect', + exportAs: 'mdSelect, matSelect', }) export class MdSelect extends _MdSelectMixinBase implements AfterContentInit, OnDestroy, OnInit, ControlValueAccessor, CanColor, CanDisable, HasTabIndex { diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts index 2031d0716541..f848e33f0443 100644 --- a/src/lib/tabs/tab.ts +++ b/src/lib/tabs/tab.ts @@ -37,7 +37,7 @@ export const _MdTabMixinBase = mixinDisabled(MdTabBase); inputs: ['disabled'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, - exportAs: 'mdTab', + exportAs: 'mdTab, matTab', }) export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChanges, OnDestroy { /** Content for the tab label given by . */ diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts index 7cca6e1c9fb9..49aaabfbb9d8 100644 --- a/src/lib/tooltip/tooltip.ts +++ b/src/lib/tooltip/tooltip.ts @@ -91,7 +91,7 @@ export const MD_TOOLTIP_SCROLL_STRATEGY_PROVIDER = { '(keydown)': '_handleKeydown($event)', '(touchend)': 'hide(' + TOUCHEND_HIDE_DELAY + ')', }, - exportAs: 'mdTooltip', + exportAs: 'mdTooltip, matTooltip', }) export class MdTooltip implements OnDestroy { _overlayRef: OverlayRef | null; diff --git a/src/material-examples/example-module.ts b/src/material-examples/example-module.ts index 95b9ca85a27d..e0faea947450 100644 --- a/src/material-examples/example-module.ts +++ b/src/material-examples/example-module.ts @@ -54,8 +54,8 @@ import {ListOverviewExample} from './list-overview/list-overview-example'; import {ListSectionsExample} from './list-sections/list-sections-example'; import {ListSelectionExample} from './list-selection/list-selection-example'; import {MenuIconsExample} from './menu-icons/menu-icons-example'; -import {NestedMenuExample} from './nested-menu/nested-menu-example'; import {MenuOverviewExample} from './menu-overview/menu-overview-example'; +import {NestedMenuExample} from './nested-menu/nested-menu-example'; import {PaginatorConfigurableExample} from './paginator-configurable/paginator-configurable-example'; import {PaginatorOverviewExample} from './paginator-overview/paginator-overview-example'; import {ProgressBarConfigurableExample} from './progress-bar-configurable/progress-bar-configurable-example'; @@ -337,18 +337,18 @@ export const EXAMPLE_COMPONENTS = { additionalFiles: null, selectorName: null }, - 'nested-menu': { - title: 'Nested menu', - component: NestedMenuExample, - additionalFiles: null, - selectorName: null - }, 'menu-overview': { title: 'Basic menu', component: MenuOverviewExample, additionalFiles: null, selectorName: null }, + 'nested-menu': { + title: 'Nested menu', + component: NestedMenuExample, + additionalFiles: null, + selectorName: null + }, 'paginator-configurable': { title: 'Configurable paginator', component: PaginatorConfigurableExample, @@ -591,8 +591,8 @@ export const EXAMPLE_LIST = [ ListSectionsExample, ListSelectionExample, MenuIconsExample, - NestedMenuExample, MenuOverviewExample, + NestedMenuExample, PaginatorConfigurableExample, PaginatorOverviewExample, ProgressBarConfigurableExample, diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts index 419afdf7d2cd..3319cbb76465 100644 --- a/tools/package-tools/rollup-globals.ts +++ b/tools/package-tools/rollup-globals.ts @@ -19,7 +19,7 @@ const rollupCdkEntryPoints = cdkSecondaryEntryPoints.reduce((globals: any, entry /** Object with all material entry points in the format of Rollup globals. */ const rollupMatEntryPoints = matSecondaryEntryPoints.reduce((globals: any, entryPoint: string) => { - globals[`@angular/material/${entryPoint}`] = `ng.mat.${dashCaseToCamelCase(entryPoint)}`; + globals[`@angular/material/${entryPoint}`] = `ng.material.${dashCaseToCamelCase(entryPoint)}`; return globals; }, {});