diff --git a/goldens/cdk/drag-drop/index.api.md b/goldens/cdk/drag-drop/index.api.md index ed37827ef231..2b38d433e2cb 100644 --- a/goldens/cdk/drag-drop/index.api.md +++ b/goldens/cdk/drag-drop/index.api.md @@ -41,7 +41,7 @@ export const CDK_DRAG_PREVIEW: InjectionToken>; export const CDK_DROP_LIST: InjectionToken>; // @public -export const CDK_DROP_LIST_GROUP: InjectionToken>; +export const CDK_DROP_LIST_GROUP: InjectionToken>>; // @public export class CdkDrag implements AfterViewInit, OnChanges, OnDestroy { diff --git a/goldens/material/chips/index.api.md b/goldens/material/chips/index.api.md index 627c1889451f..bf55f4351391 100644 --- a/goldens/material/chips/index.api.md +++ b/goldens/material/chips/index.api.md @@ -31,7 +31,7 @@ import { QueryList } from '@angular/core'; import { Subject } from 'rxjs'; // @public -export const MAT_CHIP: InjectionToken; +export const MAT_CHIP: InjectionToken; // @public export const MAT_CHIP_AVATAR: InjectionToken; diff --git a/src/cdk/drag-drop/directives/drop-list-group.ts b/src/cdk/drag-drop/directives/drop-list-group.ts index 89aedb1553f8..c8b699c9045f 100644 --- a/src/cdk/drag-drop/directives/drop-list-group.ts +++ b/src/cdk/drag-drop/directives/drop-list-group.ts @@ -6,14 +6,15 @@ * found in the LICENSE file at https://angular.dev/license */ -import {Directive, OnDestroy, Input, InjectionToken, booleanAttribute} from '@angular/core'; +import {Directive, InjectionToken, Input, OnDestroy, booleanAttribute} from '@angular/core'; +import type {CdkDropList} from './drop-list'; /** * Injection token that can be used to reference instances of `CdkDropListGroup`. It serves as * alternative token to the actual `CdkDropListGroup` class which could cause unnecessary * retention of the class and its directive metadata. */ -export const CDK_DROP_LIST_GROUP = new InjectionToken>( +export const CDK_DROP_LIST_GROUP = new InjectionToken>( 'CdkDropListGroup', ); diff --git a/src/material/chips/chip-action.ts b/src/material/chips/chip-action.ts index 6a8880d55fc4..4e48e700d368 100644 --- a/src/material/chips/chip-action.ts +++ b/src/material/chips/chip-action.ts @@ -41,7 +41,7 @@ export class MatChipContent { _handlePrimaryActionInteraction(): void; remove(): void; disabled: boolean; - _edit(): void; + _edit(event: Event): void; _isEditing?: boolean; }>(MAT_CHIP); diff --git a/src/material/chips/chip-icons.ts b/src/material/chips/chip-icons.ts index 0edc9b31a2eb..ba1e0b044bdc 100644 --- a/src/material/chips/chip-icons.ts +++ b/src/material/chips/chip-icons.ts @@ -73,7 +73,7 @@ export class MatChipEdit extends MatChipAction { if (!this.disabled) { event.stopPropagation(); event.preventDefault(); - this._parentChip._edit(); + this._parentChip._edit(event); } } @@ -81,7 +81,7 @@ export class MatChipEdit extends MatChipAction { if ((event.keyCode === ENTER || event.keyCode === SPACE) && !this.disabled) { event.stopPropagation(); event.preventDefault(); - this._parentChip._edit(); + this._parentChip._edit(event); } } } diff --git a/src/material/chips/tokens.ts b/src/material/chips/tokens.ts index 431a1a7ed17f..945ac4bc39b2 100644 --- a/src/material/chips/tokens.ts +++ b/src/material/chips/tokens.ts @@ -8,6 +8,7 @@ import {ENTER, ModifierKey} from '@angular/cdk/keycodes'; import {InjectionToken} from '@angular/core'; +import type {MatChip} from './chip'; /** Key that can be used as a separator between chips. */ export interface SeparatorKey { @@ -69,4 +70,4 @@ export const MAT_CHIP_REMOVE = new InjectionToken('MatChipRemove'); /** * Injection token used to avoid a circular dependency between the `MatChip` and `MatChipAction`. */ -export const MAT_CHIP = new InjectionToken('MatChip'); +export const MAT_CHIP = new InjectionToken('MatChip'); diff --git a/src/material/sidenav/drawer.ts b/src/material/sidenav/drawer.ts index 43e394bb5a35..0365318d4a55 100644 --- a/src/material/sidenav/drawer.ts +++ b/src/material/sidenav/drawer.ts @@ -78,7 +78,7 @@ export const MAT_DRAWER_DEFAULT_AUTOSIZE = new InjectionToken( * Used to provide a drawer container to a drawer while avoiding circular references. * @docs-private */ -export const MAT_DRAWER_CONTAINER = new InjectionToken('MAT_DRAWER_CONTAINER'); +export const MAT_DRAWER_CONTAINER = new InjectionToken('MAT_DRAWER_CONTAINER'); @Component({ selector: 'mat-drawer-content', diff --git a/src/material/slider/slider-interface.ts b/src/material/slider/slider-interface.ts index 404e871830b3..824899170535 100644 --- a/src/material/slider/slider-interface.ts +++ b/src/material/slider/slider-interface.ts @@ -30,7 +30,7 @@ export enum _MatTickMark { * Used primarily to avoid circular imports. * @docs-private */ -export const MAT_SLIDER = new InjectionToken<{}>('_MatSlider'); +export const MAT_SLIDER = new InjectionToken<_MatSlider>('_MatSlider'); /** * Injection token that can be used to query for a `MatSliderThumb`.