@@ -30,27 +30,39 @@ import {Overlay} from './overlay';
3030import { OverlayConfig } from './overlay-config' ;
3131import { OverlayRef } from './overlay-ref' ;
3232import {
33- ConnectedOverlayPositionChange ,
34- ConnectionPositionPair ,
35- } from './position/connected-position' ;
36- import { ConnectedPositionStrategy } from './position/connected-position-strategy ' ;
33+ FlexibleConnectedPositionStrategy ,
34+ ConnectedPosition ,
35+ } from './position/flexible- connected-position-strategy ' ;
36+ import { ConnectedOverlayPositionChange } from './position/connected-position' ;
3737import { RepositionScrollStrategy , ScrollStrategy } from './scroll/index' ;
3838
3939
4040/** Default set of positions for the overlay. Follows the behavior of a dropdown. */
41- const defaultPositionList = [
42- new ConnectionPositionPair (
43- { originX : 'start' , originY : 'bottom' } ,
44- { overlayX : 'start' , overlayY : 'top' } ) ,
45- new ConnectionPositionPair (
46- { originX : 'start' , originY : 'top' } ,
47- { overlayX : 'start' , overlayY : 'bottom' } ) ,
48- new ConnectionPositionPair (
49- { originX : 'end' , originY : 'top' } ,
50- { overlayX : 'end' , overlayY : 'bottom' } ) ,
51- new ConnectionPositionPair (
52- { originX : 'end' , originY : 'bottom' } ,
53- { overlayX : 'end' , overlayY : 'top' } ) ,
41+ const defaultPositionList : ConnectedPosition [ ] = [
42+ {
43+ originX : 'start' ,
44+ originY : 'bottom' ,
45+ overlayX : 'start' ,
46+ overlayY : 'top'
47+ } ,
48+ {
49+ originX : 'start' ,
50+ originY : 'top' ,
51+ overlayX : 'start' ,
52+ overlayY : 'bottom'
53+ } ,
54+ {
55+ originX : 'end' ,
56+ originY : 'top' ,
57+ overlayX : 'end' ,
58+ overlayY : 'bottom'
59+ } ,
60+ {
61+ originX : 'end' ,
62+ originY : 'bottom' ,
63+ overlayX : 'end' ,
64+ overlayY : 'top'
65+ }
5466] ;
5567
5668/** Injection token that determines the scroll handling while the connected overlay is open. */
@@ -101,21 +113,22 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
101113 private _backdropSubscription = Subscription . EMPTY ;
102114 private _offsetX : number = 0 ;
103115 private _offsetY : number = 0 ;
104- private _position : ConnectedPositionStrategy ;
116+ private _position : FlexibleConnectedPositionStrategy ;
105117
106118 /** Origin for the connected overlay. */
107119 @Input ( 'cdkConnectedOverlayOrigin' ) origin : CdkOverlayOrigin ;
108120
109121 /** Registered connected position pairs. */
110- @Input ( 'cdkConnectedOverlayPositions' ) positions : ConnectionPositionPair [ ] ;
122+ @Input ( 'cdkConnectedOverlayPositions' ) positions : ConnectedPosition [ ] ;
111123
112124 /** The offset in pixels for the overlay connection point on the x-axis */
113125 @Input ( 'cdkConnectedOverlayOffsetX' )
114126 get offsetX ( ) : number { return this . _offsetX ; }
115127 set offsetX ( offsetX : number ) {
116128 this . _offsetX = offsetX ;
129+
117130 if ( this . _position ) {
118- this . _position . withOffsetX ( offsetX ) ;
131+ this . _setPositions ( this . _position ) ;
119132 }
120133 }
121134
@@ -124,8 +137,9 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
124137 get offsetY ( ) { return this . _offsetY ; }
125138 set offsetY ( offsetY : number ) {
126139 this . _offsetY = offsetY ;
140+
127141 if ( this . _position ) {
128- this . _position . withOffsetY ( offsetY ) ;
142+ this . _setPositions ( this . _position ) ;
129143 }
130144 }
131145
@@ -264,28 +278,42 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
264278 }
265279
266280 /** Returns the position strategy of the overlay to be set on the overlay config */
267- private _createPositionStrategy ( ) : ConnectedPositionStrategy {
268- const primaryPosition = this . positions [ 0 ] ;
269- const originPoint = { originX : primaryPosition . originX , originY : primaryPosition . originY } ;
270- const overlayPoint = { overlayX : primaryPosition . overlayX , overlayY : primaryPosition . overlayY } ;
281+ private _createPositionStrategy ( ) : FlexibleConnectedPositionStrategy {
271282 const strategy = this . _overlay . position ( )
272- . connectedTo ( this . origin . elementRef , originPoint , overlayPoint )
273- . withOffsetX ( this . offsetX )
274- . withOffsetY ( this . offsetY )
283+ . flexibleConnectedTo ( this . origin . elementRef )
284+ // Turn off all of the flexible positioning features for now to have it behave
285+ // the same way as the old ConnectedPositionStrategy and to avoid breaking changes.
286+ // TODO(crisbeto): make these on by default and add inputs for them
287+ // next time we do breaking changes.
288+ . withFlexibleHeight ( false )
289+ . withFlexibleWidth ( false )
290+ . withPush ( false )
291+ . withGrowAfterOpen ( false )
275292 . withLockedPosition ( this . lockPosition ) ;
276293
277- for ( let i = 1 ; i < this . positions . length ; i ++ ) {
278- strategy . withFallbackPosition (
279- { originX : this . positions [ i ] . originX , originY : this . positions [ i ] . originY } ,
280- { overlayX : this . positions [ i ] . overlayX , overlayY : this . positions [ i ] . overlayY }
281- ) ;
282- }
283-
284- strategy . onPositionChange . subscribe ( pos => this . positionChange . emit ( pos ) ) ;
294+ this . _setPositions ( strategy ) ;
295+ strategy . positionChanges . subscribe ( p => this . positionChange . emit ( p ) ) ;
285296
286297 return strategy ;
287298 }
288299
300+ /**
301+ * Sets the primary and fallback positions of a positions strategy,
302+ * based on the current directive inputs.
303+ */
304+ private _setPositions ( positionStrategy : FlexibleConnectedPositionStrategy ) {
305+ const positions : ConnectedPosition [ ] = this . positions . map ( pos => ( {
306+ originX : pos . originX ,
307+ originY : pos . originY ,
308+ overlayX : pos . overlayX ,
309+ overlayY : pos . overlayY ,
310+ offsetX : this . offsetX ,
311+ offsetY : this . offsetY
312+ } ) ) ;
313+
314+ positionStrategy . withPositions ( positions ) ;
315+ }
316+
289317 /** Attaches the overlay and subscribes to backdrop clicks if backdrop exists */
290318 private _attachOverlay ( ) {
291319 if ( ! this . _overlayRef ) {
@@ -306,7 +334,6 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
306334 } ) ;
307335 }
308336
309- this . _position . withDirection ( this . dir ) ;
310337 this . _overlayRef . setDirection ( this . dir ) ;
311338
312339 if ( ! this . _overlayRef . hasAttached ( ) ) {
0 commit comments