Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/cdk/overlay/overlay-directives.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -402,12 +402,21 @@ describe('Overlay directives', () => {
<button cdk-overlay-origin id="trigger" #trigger="cdkOverlayOrigin">Toggle menu</button>
<button cdk-overlay-origin id="otherTrigger" #otherTrigger="cdkOverlayOrigin">Toggle menu</button>

<ng-template cdk-connected-overlay [open]="isOpen" [width]="width" [height]="height"
<ng-template cdk-connected-overlay
[cdkConnectedOverlayOpen]="isOpen"
[cdkConnectedOverlayWidth]="width"
[cdkConnectedOverlayHeight]="height"
[cdkConnectedOverlayOrigin]="triggerOverride || trigger"
[hasBackdrop]="hasBackdrop" backdropClass="mat-test-class"
(backdropClick)="backdropClickHandler($event)" [offsetX]="offsetX" [offsetY]="offsetY"
(positionChange)="positionChangeHandler($event)" (attach)="attachHandler()"
(detach)="detachHandler()" [minWidth]="minWidth" [minHeight]="minHeight"
[cdkConnectedOverlayHasBackdrop]="hasBackdrop"
cdkConnectedOverlayBackdropClass="mat-test-class"
(backdropClick)="backdropClickHandler($event)"
[cdkConnectedOverlayOffsetX]="offsetX"
[cdkConnectedOverlayOffsetY]="offsetY"
(positionChange)="positionChangeHandler($event)"
(attach)="attachHandler()"
(detach)="detachHandler()"
[cdkConnectedOverlayMinWidth]="minWidth"
[cdkConnectedOverlayMinHeight]="minHeight"
[cdkConnectedOverlayPositions]="positionOverrides">
<p>Menu content</p>
</ng-template>`,
Expand Down
98 changes: 0 additions & 98 deletions src/cdk/overlay/overlay-directives.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,104 +161,6 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
get lockPosition() { return this._lockPosition; }
set lockPosition(value: any) { this._lockPosition = coerceBooleanProperty(value); }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('origin')
get _deprecatedOrigin(): CdkOverlayOrigin { return this.origin; }
set _deprecatedOrigin(_origin: CdkOverlayOrigin) { this.origin = _origin; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('positions')
get _deprecatedPositions(): ConnectionPositionPair[] { return this.positions; }
set _deprecatedPositions(_positions: ConnectionPositionPair[]) { this.positions = _positions; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('offsetX')
get _deprecatedOffsetX(): number { return this.offsetX; }
set _deprecatedOffsetX(_offsetX: number) { this.offsetX = _offsetX; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('offsetY')
get _deprecatedOffsetY(): number { return this.offsetY; }
set _deprecatedOffsetY(_offsetY: number) { this.offsetY = _offsetY; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('width')
get _deprecatedWidth(): number | string { return this.width; }
set _deprecatedWidth(_width: number | string) { this.width = _width; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('height')
get _deprecatedHeight(): number | string { return this.height; }
set _deprecatedHeight(_height: number | string) { this.height = _height; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('minWidth')
get _deprecatedMinWidth(): number | string { return this.minWidth; }
set _deprecatedMinWidth(_minWidth: number | string) { this.minWidth = _minWidth; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('minHeight')
get _deprecatedMinHeight(): number | string { return this.minHeight; }
set _deprecatedMinHeight(_minHeight: number | string) { this.minHeight = _minHeight; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('backdropClass')
get _deprecatedBackdropClass(): string { return this.backdropClass; }
set _deprecatedBackdropClass(_backdropClass: string) { this.backdropClass = _backdropClass; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('scrollStrategy')
get _deprecatedScrollStrategy(): ScrollStrategy { return this.scrollStrategy; }
set _deprecatedScrollStrategy(_scrollStrategy: ScrollStrategy) {
this.scrollStrategy = _scrollStrategy;
}

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('open')
get _deprecatedOpen(): boolean { return this.open; }
set _deprecatedOpen(_open: boolean) { this.open = _open; }

/**
* @deprecated
* @deletion-target 6.0.0
*/
@Input('hasBackdrop')
get _deprecatedHasBackdrop() { return this.hasBackdrop; }
set _deprecatedHasBackdrop(_hasBackdrop: any) { this.hasBackdrop = _hasBackdrop; }

/** Event emitted when the backdrop is clicked. */
@Output() backdropClick = new EventEmitter<MouseEvent>();

Expand Down
12 changes: 0 additions & 12 deletions src/cdk/overlay/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,3 @@ export {PositionStrategy} from './position/position-strategy';
export {GlobalPositionStrategy} from './position/global-position-strategy';
export {ConnectedPositionStrategy} from './position/connected-position-strategy';
export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';

/**
* @deprecated Use CdkConnectedOverlay
* @deletion-target 6.0.0
*/
export {CdkConnectedOverlay as ConnectedOverlayDirective} from './overlay-directives';

/**
* @deprecated Use CdkOverlayOrigin
* @deletion-target 6.0.0
*/
export {CdkOverlayOrigin as OverlayOrigin} from './overlay-directives';
7 changes: 6 additions & 1 deletion src/demo-app/overlay/overlay-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
Open menu
</button>

<ng-template cdk-connected-overlay [origin]="trigger" [width]="500" hasBackdrop [open]="isMenuOpen"
<ng-template
cdk-connected-overlay
[cdkConnectedOverlayOrigin]="trigger"
[cdkConnectedOverlayWidth]="500"
cdkConnectedOverlayHasBackdrop
[cdkConnectedOverlayOpen]="isMenuOpen"
(backdropClick)="isMenuOpen=false">
<div style="background-color: mediumpurple" >
This is the menu panel.
Expand Down
16 changes: 8 additions & 8 deletions src/lib/select/select.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

<ng-template
cdk-connected-overlay
hasBackdrop
cdkConnectedOverlayHasBackdrop
cdkConnectedOverlayLockPosition
backdropClass="cdk-overlay-transparent-backdrop"
[scrollStrategy]="_scrollStrategy"
[origin]="origin"
[open]="panelOpen"
[positions]="_positions"
[minWidth]="_triggerRect?.width"
[offsetY]="_offsetY"
cdkConnectedOverlayBackdropClass="cdk-overlay-transparent-backdrop"
[cdkConnectedOverlayScrollStrategy]="_scrollStrategy"
[cdkConnectedOverlayOrigin]="origin"
[cdkConnectedOverlayOpen]="panelOpen"
[cdkConnectedOverlayPositions]="_positions"
[cdkConnectedOverlayMinWidth]="_triggerRect?.width"
[cdkConnectedOverlayOffsetY]="_offsetY"
(backdropClick)="close()"
(attach)="_onAttached()"
(detach)="close()">
Expand Down