Skip to content

Commit

Permalink
feat(overlay): add maxWidth and maxHeight (#6508)
Browse files Browse the repository at this point in the history
  • Loading branch information
jelbourn authored and kara committed Aug 22, 2017
1 parent 0db3635 commit 9904e56
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
8 changes: 8 additions & 0 deletions src/cdk/overlay/overlay-ref.ts
Expand Up @@ -176,6 +176,14 @@ export class OverlayRef implements PortalHost {
if (this._state.minHeight || this._state.minHeight === 0) {
this._pane.style.minHeight = formatCssUnit(this._state.minHeight);
}

if (this._state.maxWidth || this._state.maxWidth === 0) {
this._pane.style.maxWidth = formatCssUnit(this._state.maxWidth);
}

if (this._state.maxHeight || this._state.maxHeight === 0) {
this._pane.style.maxHeight = formatCssUnit(this._state.maxHeight);
}
}

/** Toggles the pointer events for the overlay pane element. */
Expand Down
6 changes: 6 additions & 0 deletions src/cdk/overlay/overlay-state.ts
Expand Up @@ -44,6 +44,12 @@ export class OverlayState {
/** The min-height of the overlay panel. If a number is provided, pixel units are assumed. */
minHeight?: number | string;

/** The max-width of the overlay panel. If a number is provided, pixel units are assumed. */
maxWidth?: number | string;

/** The max-height of the overlay panel. If a number is provided, pixel units are assumed. */
maxHeight?: number | string;

/** The direction of the text in the overlay panel. */
direction?: Direction = 'ltr';

Expand Down
17 changes: 16 additions & 1 deletion src/cdk/overlay/overlay.spec.ts
Expand Up @@ -295,6 +295,22 @@ describe('Overlay', () => {
expect(pane.style.minHeight).toEqual('500px');
});

it('should apply the max width set in the config', () => {
state.maxWidth = 200;

overlay.create(state).attach(componentPortal);
const pane = overlayContainerElement.children[0] as HTMLElement;
expect(pane.style.maxWidth).toEqual('200px');
});


it('should apply the max height set in the config', () => {
state.maxHeight = 500;

overlay.create(state).attach(componentPortal);
const pane = overlayContainerElement.children[0] as HTMLElement;
expect(pane.style.maxHeight).toEqual('500px');
});

it('should support zero widths and heights', () => {
state.width = 0;
Expand All @@ -305,7 +321,6 @@ describe('Overlay', () => {
expect(pane.style.width).toEqual('0px');
expect(pane.style.height).toEqual('0px');
});

});

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

0 comments on commit 9904e56

Please sign in to comment.