Skip to content

Commit 3bbbb17

Browse files
committed
fix(overlay): make config immutable for existing refs
This changes makes the OverlayConfig instance in OverlatRef immutable. Calling `getConfig` will now return a clone of the config to make clear that it cannot be modified directly to change the state of the overlay. This also updates the `updateSize` method to accept a partial config to apply to the existing config (and make a new config instance). This *also* tightens up the typings on Portal.attach BREAKING CHANGE: OverlayRef.getConfig returns a clone of the config object. BREAKING CHANGE: OverlayRef.updateSize now accepts a OverlaySizeConfig rather than being based on the existing config object.
1 parent 0d9f786 commit 3bbbb17

File tree

5 files changed

+64
-33
lines changed

5 files changed

+64
-33
lines changed

src/cdk/overlay/overlay-directives.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ export class ConnectedOverlayDirective implements OnDestroy, OnChanges {
337337
}
338338

339339
this._position.withDirection(this.dir);
340-
this._overlayRef.getConfig().direction = this.dir;
340+
this._overlayRef.setDirection(this.dir);
341341
this._initEscapeListener();
342342

343343
if (!this._overlayRef.hasAttached()) {

src/cdk/overlay/overlay-ref.ts

Lines changed: 57 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {NgZone} from '@angular/core';
10-
import {PortalHost, Portal} from '@angular/cdk/portal';
11-
import {OverlayConfig} from './overlay-config';
9+
import {Direction} from '@angular/cdk/bidi';
10+
import {ComponentPortal, Portal, PortalHost, TemplatePortal} from '@angular/cdk/portal';
11+
import {ComponentRef, EmbeddedViewRef, NgZone} from '@angular/core';
1212
import {Observable} from 'rxjs/Observable';
1313
import {Subject} from 'rxjs/Subject';
14+
import {OverlayConfig} from './overlay-config';
1415

16+
export type ImmutableObject<T> = {
17+
readonly [P in keyof T]: T[P];
18+
};
1519

1620
/**
1721
* Reference to an overlay that has been created with the Overlay service.
@@ -26,7 +30,7 @@ export class OverlayRef implements PortalHost {
2630
constructor(
2731
private _portalHost: PortalHost,
2832
private _pane: HTMLElement,
29-
private _config: OverlayConfig,
33+
private _config: ImmutableObject<OverlayConfig>,
3034
private _ngZone: NgZone) {
3135

3236
if (_config.scrollStrategy) {
@@ -39,8 +43,14 @@ export class OverlayRef implements PortalHost {
3943
return this._pane;
4044
}
4145

46+
attach<T>(portal: ComponentPortal<T>): ComponentRef<T>;
47+
attach<T>(portal: TemplatePortal<T>): EmbeddedViewRef<T>;
48+
attach(portal: any): any;
49+
4250
/**
43-
* Attaches the overlay to a portal instance and adds the backdrop.
51+
* Attaches content, given via a Portal, to the overlay.
52+
* If the overlay is configured to have a backdrop, it will be created.
53+
*
4454
* @param portal Portal instance to which to attach the overlay.
4555
* @returns The portal attachment result.
4656
*/
@@ -53,8 +63,8 @@ export class OverlayRef implements PortalHost {
5363

5464
// Update the pane element with the given configuration.
5565
this._updateStackingOrder();
56-
this.updateSize();
57-
this.updateDirection();
66+
this._updateElementSize();
67+
this._updateElementDirection();
5868
this.updatePosition();
5969

6070
if (this._config.scrollStrategy) {
@@ -107,9 +117,7 @@ export class OverlayRef implements PortalHost {
107117
return detachmentResult;
108118
}
109119

110-
/**
111-
* Cleans up the overlay from the DOM.
112-
*/
120+
/** Cleans up the overlay from the DOM. */
113121
dispose(): void {
114122
if (this._config.positionStrategy) {
115123
this._config.positionStrategy.dispose();
@@ -127,34 +135,29 @@ export class OverlayRef implements PortalHost {
127135
this._detachments.complete();
128136
}
129137

130-
/**
131-
* Checks whether the overlay has been attached.
132-
*/
138+
/** Whether the overlay has attached content. */
133139
hasAttached(): boolean {
134140
return this._portalHost.hasAttached();
135141
}
136142

137-
/**
138-
* Returns an observable that emits when the backdrop has been clicked.
139-
*/
143+
/** Gets an observable that emits when the backdrop has been clicked. */
140144
backdropClick(): Observable<void> {
141145
return this._backdropClick.asObservable();
142146
}
143147

144-
/** Returns an observable that emits when the overlay has been attached. */
148+
/** Gets an observable that emits when the overlay has been attached. */
145149
attachments(): Observable<void> {
146150
return this._attachments.asObservable();
147151
}
148152

149-
/** Returns an observable that emits when the overlay has been detached. */
153+
/** Gets an observable that emits when the overlay has been detached. */
150154
detachments(): Observable<void> {
151155
return this._detachments.asObservable();
152156
}
153157

154-
/**
155-
* Gets the current config of the overlay.
156-
*/
157-
getConfig(): OverlayConfig {
158+
/** Gets the the current overlay configuration, which is immutable. */
159+
getConfig(): ImmutableObject<OverlayConfig> {
160+
// Clone the config so that it cannot be modified outside of this class.
158161
return this._config;
159162
}
160163

@@ -165,13 +168,25 @@ export class OverlayRef implements PortalHost {
165168
}
166169
}
167170

171+
/** Update the size properties of the overlay. */
172+
updateSize(sizeConfig: OverlaySizeConfig) {
173+
this._config = {...this._config, ...sizeConfig};
174+
this._updateElementSize();
175+
}
176+
177+
/** Sets the LTR/RTL direction for the overlay. */
178+
setDirection(dir: Direction) {
179+
this._config = {...this._config, direction: dir};
180+
this._updateElementDirection();
181+
}
182+
168183
/** Updates the text direction of the overlay panel. */
169-
private updateDirection() {
184+
private _updateElementDirection() {
170185
this._pane.setAttribute('dir', this._config.direction!);
171186
}
172187

173-
/** Updates the size of the overlay based on the overlay config. */
174-
updateSize() {
188+
/** Updates the size of the overlay element based on the overlay config. */
189+
private _updateElementSize() {
175190
if (this._config.width || this._config.width === 0) {
176191
this._pane.style.width = formatCssUnit(this._config.width);
177192
}
@@ -220,10 +235,12 @@ export class OverlayRef implements PortalHost {
220235
this._backdropElement.addEventListener('click', () => this._backdropClick.next(null));
221236

222237
// Add class to fade-in the backdrop after one frame.
223-
requestAnimationFrame(() => {
224-
if (this._backdropElement) {
225-
this._backdropElement.classList.add('cdk-overlay-backdrop-showing');
226-
}
238+
this._ngZone.runOutsideAngular(() => {
239+
requestAnimationFrame(() => {
240+
if (this._backdropElement) {
241+
this._backdropElement.classList.add('cdk-overlay-backdrop-showing');
242+
}
243+
});
227244
});
228245
}
229246

@@ -284,3 +301,14 @@ export class OverlayRef implements PortalHost {
284301
function formatCssUnit(value: number | string) {
285302
return typeof value === 'string' ? value as string : `${value}px`;
286303
}
304+
305+
306+
/** Size properties for an overlay. */
307+
export interface OverlaySizeConfig {
308+
width?: number | string;
309+
height?: number | string;
310+
minWidth?: number | string;
311+
minHeight?: number | string;
312+
maxWidth?: number | string;
313+
maxHeight?: number | string;
314+
}

src/cdk/portal/portal.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ export abstract class BasePortalHost implements PortalHost {
179179
return !!this._attachedPortal;
180180
}
181181

182+
attach<T>(portal: ComponentPortal<T>): ComponentRef<T>;
183+
attach<T>(portal: TemplatePortal<T>): EmbeddedViewRef<T>;
184+
attach(portal: any): any;
185+
182186
attach(portal: Portal<any>): any {
183187
if (!portal) {
184188
throwNullPortalError();

src/cdk/scrolling/scrolling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
### Scrolling
22

3-
Some things to help with scrollling.
3+
Some things to help with scrollling.

src/lib/autocomplete/autocomplete-trigger.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
451451
this._overlayRef = this._overlay.create(this._getOverlayConfig());
452452
} else {
453453
/** Update the panel width, in case the host width has changed */
454-
this._overlayRef.getConfig().width = this._getHostWidth();
455-
this._overlayRef.updateSize();
454+
this._overlayRef.updateSize({width: this._getHostWidth()});
456455
}
457456

458457
if (this._overlayRef && !this._overlayRef.hasAttached()) {

0 commit comments

Comments
 (0)