diff --git a/src/material-experimental/mdc-chips/chip-grid.ts b/src/material-experimental/mdc-chips/chip-grid.ts index abfa0bee8123..206966c65802 100644 --- a/src/material-experimental/mdc-chips/chip-grid.ts +++ b/src/material-experimental/mdc-chips/chip-grid.ts @@ -30,7 +30,6 @@ import { import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms'; import { CanUpdateErrorState, - CanUpdateErrorStateCtor, ErrorStateMatcher, mixinErrorState, } from '@angular/material-experimental/mdc-core'; @@ -68,8 +67,7 @@ class MatChipGridBase extends MatChipSet { super(_elementRef, _changeDetectorRef, _dir); } } -const _MatChipGridMixinBase: CanUpdateErrorStateCtor & typeof MatChipGridBase = - mixinErrorState(MatChipGridBase); +const _MatChipGridMixinBase = mixinErrorState(MatChipGridBase); /** * An extension of the MatChipSet component used with MatChipRow chips and diff --git a/src/material-experimental/mdc-chips/chip-icons.ts b/src/material-experimental/mdc-chips/chip-icons.ts index c692a6558ea2..5b13711057cd 100644 --- a/src/material-experimental/mdc-chips/chip-icons.ts +++ b/src/material-experimental/mdc-chips/chip-icons.ts @@ -10,9 +10,7 @@ import {BooleanInput, NumberInput} from '@angular/cdk/coercion'; import {ChangeDetectorRef, Directive, ElementRef, InjectionToken, OnDestroy} from '@angular/core'; import { CanDisable, - CanDisableCtor, HasTabIndex, - HasTabIndexCtor, mixinDisabled, mixinTabIndex, } from '@angular/material-experimental/mdc-core'; @@ -143,11 +141,7 @@ class MatChipRemoveBase extends MatChipTrailingIcon { } } -const _MatChipRemoveMixinBase: - CanDisableCtor & - HasTabIndexCtor & - typeof MatChipRemoveBase = - mixinTabIndex(mixinDisabled(MatChipRemoveBase), 0); +const _MatChipRemoveMixinBase = mixinTabIndex(mixinDisabled(MatChipRemoveBase), 0); /** * Directive to remove the parent chip when the trailing icon is clicked or diff --git a/src/material-experimental/mdc-chips/chip-set.ts b/src/material-experimental/mdc-chips/chip-set.ts index 3979634ca1e5..f2829f943584 100644 --- a/src/material-experimental/mdc-chips/chip-set.ts +++ b/src/material-experimental/mdc-chips/chip-set.ts @@ -22,7 +22,7 @@ import { QueryList, ViewEncapsulation } from '@angular/core'; -import {HasTabIndex, HasTabIndexCtor, mixinTabIndex} from '@angular/material-experimental/mdc-core'; +import {HasTabIndex, mixinTabIndex} from '@angular/material-experimental/mdc-core'; import {deprecated} from '@material/chips'; import {merge, Observable, Subject, Subscription} from 'rxjs'; import {startWith, takeUntil} from 'rxjs/operators'; @@ -40,8 +40,7 @@ abstract class MatChipSetBase { abstract disabled: boolean; constructor(_elementRef: ElementRef) {} } -const _MatChipSetMixinBase: HasTabIndexCtor & typeof MatChipSetBase = - mixinTabIndex(MatChipSetBase); +const _MatChipSetMixinBase = mixinTabIndex(MatChipSetBase); /** * Basic container component for the MatChip component. diff --git a/src/material-experimental/mdc-core/public-api.ts b/src/material-experimental/mdc-core/public-api.ts index 69168a7ad91a..535eac440f71 100644 --- a/src/material-experimental/mdc-core/public-api.ts +++ b/src/material-experimental/mdc-core/public-api.ts @@ -11,21 +11,15 @@ export { AnimationCurves, AnimationDurations, CanColor, - CanColorCtor, CanDisable, - CanDisableCtor, CanDisableRipple, - CanDisableRippleCtor, CanUpdateErrorState, - CanUpdateErrorStateCtor, DateAdapter, defaultRippleAnimationConfig, ErrorStateMatcher, GranularSanityChecks, HasInitialized, - HasInitializedCtor, HasTabIndex, - HasTabIndexCtor, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MAT_DATE_LOCALE_FACTORY, diff --git a/src/material/core/common-behaviors/color.ts b/src/material/core/common-behaviors/color.ts index c0ff92314317..74b18d28d821 100644 --- a/src/material/core/common-behaviors/color.ts +++ b/src/material/core/common-behaviors/color.ts @@ -18,12 +18,7 @@ export interface CanColor { defaultColor: ThemePalette | undefined; } -/** - * @docs-private - * @deprecated No longer necessary to apply to mixin classes. To be made private. - * @breaking-change 13.0.0 - */ -export type CanColorCtor = Constructor & AbstractConstructor; +type CanColorCtor = Constructor & AbstractConstructor; /** @docs-private */ export interface HasElementRef { diff --git a/src/material/core/common-behaviors/disable-ripple.ts b/src/material/core/common-behaviors/disable-ripple.ts index 21bd29d45383..4e50ce76a2f7 100644 --- a/src/material/core/common-behaviors/disable-ripple.ts +++ b/src/material/core/common-behaviors/disable-ripple.ts @@ -15,13 +15,7 @@ export interface CanDisableRipple { disableRipple: boolean; } -/** - * @docs-private - * @deprecated No longer necessary to apply to mixin classes. To be made private. - * @breaking-change 13.0.0 - */ -export type CanDisableRippleCtor = Constructor & - AbstractConstructor; +type CanDisableRippleCtor = Constructor & AbstractConstructor; /** Mixin to augment a directive with a `disableRipple` property. */ export function mixinDisableRipple>(base: T): diff --git a/src/material/core/common-behaviors/disabled.ts b/src/material/core/common-behaviors/disabled.ts index 3a49813831b7..9e5679e569b7 100644 --- a/src/material/core/common-behaviors/disabled.ts +++ b/src/material/core/common-behaviors/disabled.ts @@ -15,12 +15,7 @@ export interface CanDisable { disabled: boolean; } -/** - * @docs-private - * @deprecated No longer necessary to apply to mixin classes. To be made private. - * @breaking-change 13.0.0 - */ -export type CanDisableCtor = Constructor & AbstractConstructor; +type CanDisableCtor = Constructor & AbstractConstructor; /** Mixin to augment a directive with a `disabled` property. */ export function mixinDisabled>(base: T): CanDisableCtor & T; diff --git a/src/material/core/common-behaviors/error-state.ts b/src/material/core/common-behaviors/error-state.ts index 2289fdfdb444..d87bc25dfb13 100644 --- a/src/material/core/common-behaviors/error-state.ts +++ b/src/material/core/common-behaviors/error-state.ts @@ -24,13 +24,8 @@ export interface CanUpdateErrorState { errorStateMatcher: ErrorStateMatcher; } -/** - * @docs-private - * @deprecated No longer necessary to apply to mixin classes. To be made private. - * @breaking-change 13.0.0 - */ -export type CanUpdateErrorStateCtor = Constructor & - AbstractConstructor; +type CanUpdateErrorStateCtor = Constructor & + AbstractConstructor; /** @docs-private */ export interface HasErrorState { diff --git a/src/material/core/common-behaviors/index.ts b/src/material/core/common-behaviors/index.ts index 8d29f9be5a26..7f708f4a7ea9 100644 --- a/src/material/core/common-behaviors/index.ts +++ b/src/material/core/common-behaviors/index.ts @@ -12,9 +12,9 @@ export { SanityChecks, GranularSanityChecks, } from './common-module'; -export {CanDisable, CanDisableCtor, mixinDisabled} from './disabled'; -export {CanColor, CanColorCtor, mixinColor, ThemePalette} from './color'; -export {CanDisableRipple, CanDisableRippleCtor, mixinDisableRipple} from './disable-ripple'; -export {HasTabIndex, HasTabIndexCtor, mixinTabIndex} from './tabindex'; -export {CanUpdateErrorState, CanUpdateErrorStateCtor, mixinErrorState} from './error-state'; -export {HasInitialized, HasInitializedCtor, mixinInitialized} from './initialized'; +export {CanDisable, mixinDisabled} from './disabled'; +export {CanColor, mixinColor, ThemePalette} from './color'; +export {CanDisableRipple, mixinDisableRipple} from './disable-ripple'; +export {HasTabIndex, mixinTabIndex} from './tabindex'; +export {CanUpdateErrorState, mixinErrorState} from './error-state'; +export {HasInitialized, mixinInitialized} from './initialized'; diff --git a/src/material/core/common-behaviors/initialized.ts b/src/material/core/common-behaviors/initialized.ts index a54426a43b88..25c9f4e25ce3 100644 --- a/src/material/core/common-behaviors/initialized.ts +++ b/src/material/core/common-behaviors/initialized.ts @@ -29,12 +29,7 @@ export interface HasInitialized { _markInitialized: () => void; } -/** - * @docs-private - * @deprecated No longer necessary to apply to mixin classes. To be made private. - * @breaking-change 13.0.0 - */ -export type HasInitializedCtor = Constructor; +type HasInitializedCtor = Constructor; /** Mixin to augment a directive with an initialized property that will emits when ngOnInit ends. */ export function mixinInitialized>(base: T): diff --git a/src/material/core/common-behaviors/tabindex.ts b/src/material/core/common-behaviors/tabindex.ts index 2c17fdd1c261..6a5154a5c802 100644 --- a/src/material/core/common-behaviors/tabindex.ts +++ b/src/material/core/common-behaviors/tabindex.ts @@ -20,12 +20,7 @@ export interface HasTabIndex { defaultTabIndex: number; } -/** - * @docs-private - * @deprecated No longer necessary to apply to mixin classes. To be made private. - * @breaking-change 13.0.0 - */ -export type HasTabIndexCtor = Constructor & AbstractConstructor; +type HasTabIndexCtor = Constructor & AbstractConstructor; /** Mixin to augment a directive with a `tabIndex` property. */ export function mixinTabIndex>(base: T, diff --git a/tools/public_api_guard/material/core.md b/tools/public_api_guard/material/core.md index 4bd3a10e2adf..c14027952212 100644 --- a/tools/public_api_guard/material/core.md +++ b/tools/public_api_guard/material/core.md @@ -61,25 +61,16 @@ export interface CanColor { defaultColor: ThemePalette | undefined; } -// @public @deprecated -export type CanColorCtor = Constructor & AbstractConstructor; - // @public export interface CanDisable { disabled: boolean; } -// @public @deprecated -export type CanDisableCtor = Constructor & AbstractConstructor; - // @public export interface CanDisableRipple { disableRipple: boolean; } -// @public @deprecated -export type CanDisableRippleCtor = Constructor & AbstractConstructor; - // @public export interface CanUpdateErrorState { errorState: boolean; @@ -88,9 +79,6 @@ export interface CanUpdateErrorState { updateErrorState(): void; } -// @public @deprecated -export type CanUpdateErrorStateCtor = Constructor & AbstractConstructor; - // @public export function _countGroupLabelsBeforeOption(optionIndex: number, options: QueryList, optionGroups: QueryList): number; @@ -165,18 +153,12 @@ export interface HasInitialized { _markInitialized: () => void; } -// @public @deprecated -export type HasInitializedCtor = Constructor; - // @public export interface HasTabIndex { defaultTabIndex: number; tabIndex: number; } -// @public @deprecated -export type HasTabIndexCtor = Constructor & AbstractConstructor; - // @public (undocumented) export const MAT_DATE_FORMATS: InjectionToken; diff --git a/tools/public_api_guard/material/paginator.md b/tools/public_api_guard/material/paginator.md index 449a943797af..a1e5c27746e3 100644 --- a/tools/public_api_guard/material/paginator.md +++ b/tools/public_api_guard/material/paginator.md @@ -11,7 +11,6 @@ import { ChangeDetectorRef } from '@angular/core'; import { Constructor } from '@angular/material/core/common-behaviors/constructor'; import { EventEmitter } from '@angular/core'; import { HasInitialized } from '@angular/material/core'; -import { HasInitializedCtor } from '@angular/material/core'; import * as i0 from '@angular/core'; import * as i2 from '@angular/common'; import * as i3 from '@angular/material/button'; diff --git a/tools/public_api_guard/material/sort.md b/tools/public_api_guard/material/sort.md index 0288655b497b..7b293e52886e 100644 --- a/tools/public_api_guard/material/sort.md +++ b/tools/public_api_guard/material/sort.md @@ -15,7 +15,6 @@ import { ElementRef } from '@angular/core'; import { EventEmitter } from '@angular/core'; import { FocusMonitor } from '@angular/cdk/a11y'; import { HasInitialized } from '@angular/material/core'; -import { HasInitializedCtor } from '@angular/material/core'; import * as i0 from '@angular/core'; import * as i3 from '@angular/common'; import * as i4 from '@angular/material/core';