Skip to content

fix(overlay): centered flexible positioning not working in some browsers #10701

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
Apr 10, 2018
Merged

fix(overlay): centered flexible positioning not working in some browsers #10701

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
9 changes: 6 additions & 3 deletions src/cdk/overlay/_overlay.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ $backdrop-animation-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;

// A single overlay pane.
.cdk-overlay-pane {
// Note: it's important for this one to start off `absolute`,
// in order for us to be able to measure it correctly.
position: absolute;

pointer-events: auto;
box-sizing: border-box;
z-index: $cdk-z-index-overlay;
Expand Down Expand Up @@ -113,8 +114,10 @@ $backdrop-animation-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;
// When *not* centering, a top/left/bottom/right will be set which overrides the normal
// flex layout.
display: flex;
justify-content: center;
align-items: center;

// We use the `column` direction here to avoid some flexbox issues in Edge
// when using the "grow after open" options.
flex-direction: column;

// Add some dimensions so the element has an `innerText` which some people depend on in tests.
min-width: 1px;
Expand Down
3 changes: 1 addition & 2 deletions src/cdk/overlay/overlay-directives.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,7 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
// the same way as the old ConnectedPositionStrategy and to avoid breaking changes.
// TODO(crisbeto): make these on by default and add inputs for them
// next time we do breaking changes.
.withFlexibleHeight(false)
.withFlexibleWidth(false)
.withFlexibleDimensions(false)
.withPush(false)
.withGrowAfterOpen(false)
.withLockedPosition(this.lockPosition);
Expand Down
3 changes: 1 addition & 2 deletions src/cdk/overlay/position/connected-position-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ export class ConnectedPositionStrategy implements PositionStrategy {
// proxy all of the API calls.
this._positionStrategy =
new FlexibleConnectedPositionStrategy(connectedTo, viewportRuler, document)
.withFlexibleHeight(false)
.withFlexibleWidth(false)
.withFlexibleDimensions(false)
.withPush(false)
.withViewportMargin(0);

Expand Down
151 changes: 78 additions & 73 deletions src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ describe('FlexibleConnectedPositionStrategy', () => {
document.body.appendChild(originElement);
positionStrategy = overlay.position()
.flexibleConnectedTo(new ElementRef(originElement))
.withFlexibleHeight(false)
.withFlexibleWidth(false)
.withFlexibleDimensions(false)
.withPush(false);
});

Expand Down Expand Up @@ -865,8 +864,7 @@ describe('FlexibleConnectedPositionStrategy', () => {
document.body.appendChild(originElement);
positionStrategy = overlay.position()
.flexibleConnectedTo(new ElementRef(originElement))
.withFlexibleHeight(false)
.withFlexibleWidth(false)
.withFlexibleDimensions(false)
.withPush();
});

Expand Down Expand Up @@ -1003,8 +1001,8 @@ describe('FlexibleConnectedPositionStrategy', () => {

it('should align the overlay to `flex-start` when the content is flowing to the right', () => {
positionStrategy
.withFlexibleWidth()
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'start',
Expand All @@ -1014,13 +1012,13 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy});

expect(overlayRef.overlayElement.style.justifyContent).toBe('flex-start');
expect(overlayRef.hostElement.style.alignItems).toBe('flex-start');
});

it('should align the overlay to `flex-end` when the content is flowing to the left', () => {
positionStrategy
.withFlexibleWidth()
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'end',
Expand All @@ -1030,13 +1028,13 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy});

expect(overlayRef.overlayElement.style.justifyContent).toBe('flex-end');
expect(overlayRef.hostElement.style.alignItems).toBe('flex-end');
});

it('should align the overlay to `center` when the content is centered', () => {
positionStrategy
.withFlexibleWidth()
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'center',
Expand All @@ -1046,48 +1044,48 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy});

expect(overlayRef.overlayElement.style.justifyContent).toBe('center');
expect(overlayRef.hostElement.style.alignItems).toBe('center');
});

// TODO(crisbeto): investigate failure in older Safari
// it('should support offsets when centering', () => {
// originElement.style.top = '200px';
// originElement.style.left = '200px';

// positionStrategy
// .withFlexibleWidth()
// .withFlexibleHeight()
// .withPositions([{
// overlayY: 'center',
// overlayX: 'center',
// originY: 'center',
// originX: 'center',
// offsetY: 20,
// offsetX: -15
// }]);

// attachOverlay({positionStrategy});

// const originRect = originElement.getBoundingClientRect();
// const originCenterY = originRect.top + (ORIGIN_HEIGHT / 2);
// const originCenterX = originRect.left + (ORIGIN_WIDTH / 2);

// const overlayRect = overlayRef.overlayElement.getBoundingClientRect();
// const overlayCenterY = overlayRect.top + (OVERLAY_HEIGHT / 2);
// const overlayCenterX = overlayRect.left + (OVERLAY_WIDTH / 2);

// expect(overlayRef.overlayElement.style.transform)
// .toBe('translateX(-15px) translateY(20px)');
// expect(Math.floor(overlayCenterY)).toBe(Math.floor(originCenterY) + 20);
// expect(Math.floor(overlayCenterX)).toBe(Math.floor(originCenterX) - 15);
// });
it('should support offsets when centering', () => {
originElement.style.top = '200px';
originElement.style.left = '200px';

positionStrategy
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'center',
overlayX: 'center',
originY: 'center',
originX: 'center',
offsetY: 20,
offsetX: -15
}]);

attachOverlay({positionStrategy});

const originRect = originElement.getBoundingClientRect();
const originCenterX = originRect.left + (DEFAULT_WIDTH / 2);
const originCenterY = originRect.top + (DEFAULT_HEIGHT / 2);

const overlayRect = overlayRef.overlayElement.getBoundingClientRect();
const overlayCenterY = overlayRect.top + (OVERLAY_HEIGHT / 2);
const overlayCenterX = overlayRect.left + (OVERLAY_WIDTH / 2);

expect(overlayRef.overlayElement.style.transform)
.toBe('translateX(-15px) translateY(20px)');
expect(Math.floor(overlayCenterY)).toBe(Math.floor(originCenterY) + 20);
expect(Math.floor(overlayCenterX)).toBe(Math.floor(originCenterX) - 15);
});

it('should become scrollable when it hits the viewport edge with a flexible height', () => {
originElement.style.left = '200px';
originElement.style.bottom = `${OVERLAY_HEIGHT - 10}px`;

positionStrategy
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'start',
Expand All @@ -1107,7 +1105,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.right = '-20px';

positionStrategy
.withFlexibleWidth()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'start',
Expand All @@ -1127,7 +1126,7 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.bottom = `${OVERLAY_HEIGHT - 10}px`;

positionStrategy
.withFlexibleHeight()
.withFlexibleDimensions()
.withPositions([{
overlayY: 'top',
overlayX: 'start',
Expand All @@ -1149,7 +1148,7 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.right = '-20px';

positionStrategy
.withFlexibleWidth()
.withFlexibleDimensions()
.withPositions([{
overlayY: 'top',
overlayX: 'start',
Expand All @@ -1171,7 +1170,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.right = '25px';

positionStrategy
.withFlexibleWidth()
.withFlexibleDimensions()
.withPush(false)
.withPositions([
{
originX: 'end',
Expand Down Expand Up @@ -1202,7 +1202,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.bottom = `${OVERLAY_HEIGHT - 10}px`;

positionStrategy
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withGrowAfterOpen()
.withPositions([{
overlayY: 'top',
Expand Down Expand Up @@ -1239,7 +1240,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
window.scroll(0, 50);

positionStrategy
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'bottom',
overlayX: 'start',
Expand All @@ -1257,14 +1259,15 @@ describe('FlexibleConnectedPositionStrategy', () => {
window.scroll(0, 0);
document.body.removeChild(veryLargeElement);
});

it('should set the proper styles when the `bottom` value is exactly zero', () => {
originElement.style.position = 'fixed';
originElement.style.bottom = '0';
originElement.style.left = '200px';

positionStrategy
.withFlexibleWidth()
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'bottom',
overlayX: 'start',
Expand All @@ -1289,8 +1292,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.left = '200px';

positionStrategy
.withFlexibleWidth()
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'start',
Expand All @@ -1315,8 +1318,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.top = '200px';

positionStrategy
.withFlexibleWidth()
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'start',
Expand All @@ -1341,8 +1344,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.top = '200px';

positionStrategy
.withFlexibleWidth()
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withPositions([{
overlayY: 'top',
overlayX: 'end',
Expand All @@ -1368,7 +1371,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
originElement.style.right = '200px';

positionStrategy
.withFlexibleHeight()
.withFlexibleDimensions()
.withPush(false)
.withViewportMargin(viewportMargin)
.withPositions([
{
Expand Down Expand Up @@ -1408,6 +1412,7 @@ describe('FlexibleConnectedPositionStrategy', () => {
// Create a strategy with knowledge of the scrollable container
const strategy = overlay.position()
.flexibleConnectedTo(new ElementRef(originElement))
.withPush(false)
.withPositions([{
originX: 'start',
originY: 'bottom',
Expand Down Expand Up @@ -1503,8 +1508,8 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy});

expect(overlayRef.overlayElement.style.left).toBeTruthy();
expect(overlayRef.overlayElement.style.right).toBeFalsy();
expect(overlayRef.hostElement.style.left).toBeTruthy();
expect(overlayRef.hostElement.style.right).toBeFalsy();
});

it('should use `right` when positioning an element at the end', () => {
Expand All @@ -1517,8 +1522,8 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy});

expect(overlayRef.overlayElement.style.right).toBeTruthy();
expect(overlayRef.overlayElement.style.left).toBeFalsy();
expect(overlayRef.hostElement.style.right).toBeTruthy();
expect(overlayRef.hostElement.style.left).toBeFalsy();
});

});
Expand All @@ -1537,8 +1542,8 @@ describe('FlexibleConnectedPositionStrategy', () => {
direction: 'rtl'
});

expect(overlayRef.overlayElement.style.right).toBeTruthy();
expect(overlayRef.overlayElement.style.left).toBeFalsy();
expect(overlayRef.hostElement.style.right).toBeTruthy();
expect(overlayRef.hostElement.style.left).toBeFalsy();
});

it('should use `left` when positioning an element at the end', () => {
Expand All @@ -1551,8 +1556,8 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy, direction: 'rtl'});

expect(overlayRef.overlayElement.style.left).toBeTruthy();
expect(overlayRef.overlayElement.style.right).toBeFalsy();
expect(overlayRef.hostElement.style.left).toBeTruthy();
expect(overlayRef.hostElement.style.right).toBeFalsy();
});
});

Expand All @@ -1567,8 +1572,8 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy});

expect(overlayRef.overlayElement.style.top).toBeTruthy();
expect(overlayRef.overlayElement.style.bottom).toBeFalsy();
expect(overlayRef.hostElement.style.top).toBeTruthy();
expect(overlayRef.hostElement.style.bottom).toBeFalsy();
});

it('should use `bottom` when positioning at element along the bottom', () => {
Expand All @@ -1581,8 +1586,8 @@ describe('FlexibleConnectedPositionStrategy', () => {

attachOverlay({positionStrategy});

expect(overlayRef.overlayElement.style.bottom).toBeTruthy();
expect(overlayRef.overlayElement.style.top).toBeFalsy();
expect(overlayRef.hostElement.style.bottom).toBeTruthy();
expect(overlayRef.hostElement.style.top).toBeFalsy();
});
});

Expand Down
Loading