Skip to content

fix(overlay): CdkConnectedOverlay ignoring offset from position config #10451

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
Mar 27, 2018
Merged

fix(overlay): CdkConnectedOverlay ignoring offset from position config #10451

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
30 changes: 28 additions & 2 deletions src/cdk/overlay/overlay-directives.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,32 @@ describe('Overlay directives', () => {
expect(Math.floor(triggerRect.bottom)).toBe(Math.floor(overlayRect.top));
});

it('should take the offset from the position', () => {
const trigger = fixture.nativeElement.querySelector('#trigger');

trigger.style.position = 'fixed';
trigger.style.top = '200px';
trigger.style.left = '200px';

fixture.componentInstance.positionOverrides = [{
originX: 'start',
originY: 'top',
overlayX: 'start',
overlayY: 'top',
offsetX: 20,
offsetY: 10
}];

fixture.componentInstance.isOpen = true;
fixture.detectChanges();

const triggerRect = trigger.getBoundingClientRect();
const overlayRect = getPaneElement().getBoundingClientRect();

expect(Math.floor(overlayRect.top)).toBe(Math.floor(triggerRect.top) + 10);
expect(Math.floor(overlayRect.left)).toBe(Math.floor(triggerRect.left) + 20);
});

});

describe('outputs', () => {
Expand Down Expand Up @@ -418,8 +444,8 @@ class ConnectedOverlayDirectiveTest {
height: number | string;
minWidth: number | string;
minHeight: number | string;
offsetX = 0;
offsetY = 0;
offsetX: number;
offsetY: number;
triggerOverride: CdkOverlayOrigin;
hasBackdrop: boolean;
backdropClickHandler = jasmine.createSpy('backdropClick handler');
Expand Down
8 changes: 4 additions & 4 deletions src/cdk/overlay/overlay-directives.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
private _hasBackdrop = false;
private _lockPosition = false;
private _backdropSubscription = Subscription.EMPTY;
private _offsetX: number = 0;
private _offsetY: number = 0;
private _offsetX: number;
private _offsetY: number;
private _position: FlexibleConnectedPositionStrategy;

/** Origin for the connected overlay. */
Expand Down Expand Up @@ -307,8 +307,8 @@ export class CdkConnectedOverlay implements OnDestroy, OnChanges {
originY: pos.originY,
overlayX: pos.overlayX,
overlayY: pos.overlayY,
offsetX: this.offsetX,
offsetY: this.offsetY
offsetX: pos.offsetX || this.offsetX,
offsetY: pos.offsetY || this.offsetY
}));

positionStrategy.withPositions(positions);
Expand Down