@@ -42,7 +42,13 @@ import {
42
42
MatOptionParentComponent ,
43
43
} from '../core' ;
44
44
import { Directionality } from '@angular/cdk/bidi' ;
45
- import { Overlay , OverlayRef , ScrollStrategy } from '@angular/cdk/overlay' ;
45
+ import {
46
+ createFlexibleConnectedPositionStrategy ,
47
+ createOverlayRef ,
48
+ createRepositionScrollStrategy ,
49
+ OverlayRef ,
50
+ ScrollStrategy ,
51
+ } from '@angular/cdk/overlay' ;
46
52
import { TemplatePortal } from '@angular/cdk/portal' ;
47
53
import { _getEventTarget } from '@angular/cdk/platform' ;
48
54
import { ENTER , ESCAPE , hasModifierKey , TAB } from '@angular/cdk/keycodes' ;
@@ -69,8 +75,8 @@ export const MAT_TIMEPICKER_SCROLL_STRATEGY = new InjectionToken<() => ScrollStr
69
75
{
70
76
providedIn : 'root' ,
71
77
factory : ( ) => {
72
- const overlay = inject ( Overlay ) ;
73
- return ( ) => overlay . scrollStrategies . reposition ( ) ;
78
+ const injector = inject ( Injector ) ;
79
+ return ( ) => createRepositionScrollStrategy ( injector ) ;
74
80
} ,
75
81
} ,
76
82
) ;
@@ -95,7 +101,6 @@ export const MAT_TIMEPICKER_SCROLL_STRATEGY = new InjectionToken<() => ScrollStr
95
101
] ,
96
102
} )
97
103
export class MatTimepicker < D > implements OnDestroy , MatOptionParentComponent {
98
- private _overlay = inject ( Overlay ) ;
99
104
private _dir = inject ( Directionality , { optional : true } ) ;
100
105
private _viewContainerRef = inject ( ViewContainerRef ) ;
101
106
private _injector = inject ( Injector ) ;
@@ -316,9 +321,10 @@ export class MatTimepicker<D> implements OnDestroy, MatOptionParentComponent {
316
321
return this . _overlayRef ;
317
322
}
318
323
319
- const positionStrategy = this . _overlay
320
- . position ( )
321
- . flexibleConnectedTo ( this . _input ( ) ! . getOverlayOrigin ( ) )
324
+ const positionStrategy = createFlexibleConnectedPositionStrategy (
325
+ this . _injector ,
326
+ this . _input ( ) ! . getOverlayOrigin ( ) ,
327
+ )
322
328
. withFlexibleDimensions ( false )
323
329
. withPush ( false )
324
330
. withTransformOriginOn ( '.mat-timepicker-panel' )
@@ -338,7 +344,7 @@ export class MatTimepicker<D> implements OnDestroy, MatOptionParentComponent {
338
344
} ,
339
345
] ) ;
340
346
341
- this . _overlayRef = this . _overlay . create ( {
347
+ this . _overlayRef = createOverlayRef ( this . _injector , {
342
348
positionStrategy,
343
349
scrollStrategy : this . _scrollStrategyFactory ( ) ,
344
350
direction : this . _dir || 'ltr' ,
0 commit comments