diff --git a/src/material/dialog/dialog-content-directives.ts b/src/material/dialog/dialog-content-directives.ts index 100dd9a26284..dac9c74ccf66 100644 --- a/src/material/dialog/dialog-content-directives.ts +++ b/src/material/dialog/dialog-content-directives.ts @@ -16,6 +16,7 @@ import { Optional, SimpleChanges, } from '@angular/core'; +import {CdkScrollable} from '@angular/cdk/scrolling'; import {MatDialog} from './dialog'; import {_closeDialogVia, MatDialogRef} from './dialog-ref'; @@ -159,6 +160,7 @@ export class MatDialogTitle extends MatDialogLayoutSection { selector: `[mat-dialog-content], mat-dialog-content, [matDialogContent]`, host: {'class': 'mat-mdc-dialog-content mdc-dialog__content'}, standalone: true, + hostDirectives: [CdkScrollable], }) export class MatDialogContent {} diff --git a/src/material/dialog/dialog.spec.ts b/src/material/dialog/dialog.spec.ts index e0bb260b1506..fe0a4606f5d4 100644 --- a/src/material/dialog/dialog.spec.ts +++ b/src/material/dialog/dialog.spec.ts @@ -86,7 +86,11 @@ describe('MDC-based MatDialog', () => { {provide: Location, useClass: SpyLocation}, { provide: ScrollDispatcher, - useFactory: () => ({scrolled: () => scrolledSubject}), + useFactory: () => ({ + scrolled: () => scrolledSubject, + register: () => {}, + deregister: () => {}, + }), }, ], }); diff --git a/tools/public_api_guard/material/dialog.md b/tools/public_api_guard/material/dialog.md index f86a2aa1d13c..a9a1d6747ef8 100644 --- a/tools/public_api_guard/material/dialog.md +++ b/tools/public_api_guard/material/dialog.md @@ -19,7 +19,8 @@ import { FocusMonitor } from '@angular/cdk/a11y'; import { FocusOrigin } from '@angular/cdk/a11y'; import { FocusTrapFactory } from '@angular/cdk/a11y'; import * as i0 from '@angular/core'; -import * as i1 from '@angular/cdk/dialog'; +import * as i1 from '@angular/cdk/scrolling'; +import * as i1_2 from '@angular/cdk/dialog'; import * as i2 from '@angular/cdk/overlay'; import * as i3 from '@angular/cdk/portal'; import * as i4 from '@angular/material/core'; @@ -211,7 +212,7 @@ export class MatDialogContainer extends CdkDialogContainer impl // @public export class MatDialogContent { // (undocumented) - static ɵdir: i0.ɵɵDirectiveDeclaration; + static ɵdir: i0.ɵɵDirectiveDeclaration; // (undocumented) static ɵfac: i0.ɵɵFactoryDeclaration; } @@ -223,7 +224,7 @@ export class MatDialogModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public