Skip to content

fix(overlay): unable to reset overlay size properties to initial value #11592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2018
Merged

fix(overlay): unable to reset overlay size properties to initial value #11592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 8 additions & 23 deletions src/cdk/overlay/overlay-ref.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,29 +264,14 @@ export class OverlayRef implements PortalOutlet {

/** Updates the size of the overlay element based on the overlay config. */
private _updateElementSize() {
if (this._config.width || this._config.width === 0) {
this._pane.style.width = coerceCssPixelValue(this._config.width);
}

if (this._config.height || this._config.height === 0) {
this._pane.style.height = coerceCssPixelValue(this._config.height);
}

if (this._config.minWidth || this._config.minWidth === 0) {
this._pane.style.minWidth = coerceCssPixelValue(this._config.minWidth);
}

if (this._config.minHeight || this._config.minHeight === 0) {
this._pane.style.minHeight = coerceCssPixelValue(this._config.minHeight);
}

if (this._config.maxWidth || this._config.maxWidth === 0) {
this._pane.style.maxWidth = coerceCssPixelValue(this._config.maxWidth);
}

if (this._config.maxHeight || this._config.maxHeight === 0) {
this._pane.style.maxHeight = coerceCssPixelValue(this._config.maxHeight);
}
const style = this._pane.style;

style.width = coerceCssPixelValue(this._config.width);
Copy link
Member

@jelbourn jelbourn May 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ideally we'd want to use hasOwnProperty here, but we wouldn't be able to do it in a way that works both inside and outside Google due to Closure Compiler's property renaming.

style.height = coerceCssPixelValue(this._config.height);
style.minWidth = coerceCssPixelValue(this._config.minWidth);
style.minHeight = coerceCssPixelValue(this._config.minHeight);
style.maxWidth = coerceCssPixelValue(this._config.maxWidth);
style.maxHeight = coerceCssPixelValue(this._config.maxHeight);
}

/** Toggles the pointer events for the overlay pane element. */
Expand Down
59 changes: 47 additions & 12 deletions src/cdk/overlay/overlay.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ describe('Overlay', () => {

overlayRef.attach(componentPortal);

expect(overlayRef.hostElement.getAttribute('dir')).toEqual('rtl');
expect(overlayRef.hostElement.getAttribute('dir')).toBe('rtl');
});

it('should emit when an overlay is attached', () => {
Expand Down Expand Up @@ -375,7 +375,7 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.width).toEqual('500px');
expect(overlayRef.overlayElement.style.width).toBe('500px');
});

it('should support using other units if a string width is provided', () => {
Expand All @@ -384,7 +384,7 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.width).toEqual('200%');
expect(overlayRef.overlayElement.style.width).toBe('200%');
});

it('should apply the height set in the config', () => {
Expand All @@ -393,7 +393,7 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.height).toEqual('500px');
expect(overlayRef.overlayElement.style.height).toBe('500px');
});

it('should support using other units if a string height is provided', () => {
Expand All @@ -402,7 +402,7 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.height).toEqual('100vh');
expect(overlayRef.overlayElement.style.height).toBe('100vh');
});

it('should apply the min width set in the config', () => {
Expand All @@ -411,17 +411,16 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.minWidth).toEqual('200px');
expect(overlayRef.overlayElement.style.minWidth).toBe('200px');
});


it('should apply the min height set in the config', () => {
config.minHeight = 500;

const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.minHeight).toEqual('500px');
expect(overlayRef.overlayElement.style.minHeight).toBe('500px');
});

it('should apply the max width set in the config', () => {
Expand All @@ -430,7 +429,7 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.maxWidth).toEqual('200px');
expect(overlayRef.overlayElement.style.maxWidth).toBe('200px');
});


Expand All @@ -440,7 +439,7 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.maxHeight).toEqual('500px');
expect(overlayRef.overlayElement.style.maxHeight).toBe('500px');
});

it('should support zero widths and heights', () => {
Expand All @@ -450,9 +449,45 @@ describe('Overlay', () => {
const overlayRef = overlay.create(config);

overlayRef.attach(componentPortal);
expect(overlayRef.overlayElement.style.width).toEqual('0px');
expect(overlayRef.overlayElement.style.height).toEqual('0px');
expect(overlayRef.overlayElement.style.width).toBe('0px');
expect(overlayRef.overlayElement.style.height).toBe('0px');
});

it('should be able to reset the various size properties', () => {
config.minWidth = config.minHeight = 100;
config.width = config.height = 200;
config.maxWidth = config.maxHeight = 300;

const overlayRef = overlay.create(config);
overlayRef.attach(componentPortal);
const style = overlayRef.overlayElement.style;

expect(style.minWidth).toBe('100px');
expect(style.minHeight).toBe('100px');
expect(style.width).toBe('200px');
expect(style.height).toBe('200px');
expect(style.maxWidth).toBe('300px');
expect(style.maxHeight).toBe('300px');

overlayRef.updateSize({
minWidth: '',
minHeight: '',
width: '',
height: '',
maxWidth: '',
maxHeight: ''
});

overlayRef.updatePosition();

expect(style.minWidth).toBeFalsy();
expect(style.minHeight).toBeFalsy();
expect(style.width).toBeFalsy();
expect(style.height).toBeFalsy();
expect(style.maxWidth).toBeFalsy();
expect(style.maxHeight).toBeFalsy();
});

});

describe('backdrop', () => {
Expand Down