From 5116bd1be6b8c6bf2e2ddc9ed44f91076c53ae27 Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Fri, 4 Nov 2016 12:52:04 -0700
Subject: [PATCH] fix(overlay): fix connected position calculation while
 scrolled

---
 .../connected-position-strategy.spec.ts       | 19 +++++++++++++++++--
 .../position/connected-position-strategy.ts   |  6 ++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/lib/core/overlay/position/connected-position-strategy.spec.ts b/src/lib/core/overlay/position/connected-position-strategy.spec.ts
index 7825170a98e6..1bf84a26a1f4 100644
--- a/src/lib/core/overlay/position/connected-position-strategy.spec.ts
+++ b/src/lib/core/overlay/position/connected-position-strategy.spec.ts
@@ -20,6 +20,7 @@ describe('ConnectedPositionStrategy', () => {
 
   let originElement: HTMLElement;
   let overlayElement: HTMLElement;
+  let overlayContainerElement: HTMLElement;
   let strategy: ConnectedPositionStrategy;
   let fakeElementRef: ElementRef;
   let fakeViewportRuler: FakeViewportRuler;
@@ -34,9 +35,11 @@ describe('ConnectedPositionStrategy', () => {
 
     // The origin and overlay elements need to be in the document body in order to have geometry.
     originElement = createPositionedBlockElement();
+    overlayContainerElement = createFixedElement();
     overlayElement = createPositionedBlockElement();
     document.body.appendChild(originElement);
-    document.body.appendChild(overlayElement);
+    document.body.appendChild(overlayContainerElement);
+    overlayContainerElement.appendChild(overlayElement);
 
     fakeElementRef = new FakeElementRef(originElement);
     positionBuilder = new OverlayPositionBuilder(new ViewportRuler());
@@ -44,7 +47,7 @@ describe('ConnectedPositionStrategy', () => {
 
   afterEach(() => {
     document.body.removeChild(originElement);
-    document.body.removeChild(overlayElement);
+    document.body.removeChild(overlayContainerElement);
 
     // Reset the origin geometry after each test so we don't accidently keep state between tests.
     originRect = null;
@@ -359,6 +362,18 @@ function createPositionedBlockElement() {
   return element;
 }
 
+/** Creates an position: fixed element that spans the screen size. */
+function createFixedElement() {
+  let element = document.createElement('div');
+  element.style.position = 'fixed';
+  element.style.top = '0';
+  element.style.left = '0';
+  element.style.width = `100%`;
+  element.style.height = `100%`;
+  element.style.zIndex = '100';
+  return element;
+}
+
 
 /** Fake implementation of ViewportRuler that just returns the previously given ClientRect. */
 class FakeViewportRuler implements ViewportRuler {
diff --git a/src/lib/core/overlay/position/connected-position-strategy.ts b/src/lib/core/overlay/position/connected-position-strategy.ts
index cf9100684ff4..7e3da99318f6 100644
--- a/src/lib/core/overlay/position/connected-position-strategy.ts
+++ b/src/lib/core/overlay/position/connected-position-strategy.ts
@@ -217,10 +217,8 @@ export class ConnectedPositionStrategy implements PositionStrategy {
    * @param overlayPoint
    */
   private _setElementPosition(element: HTMLElement, overlayPoint: Point) {
-    let scrollPos = this._viewportRuler.getViewportScrollPosition();
-
-    let x = overlayPoint.x + scrollPos.left;
-    let y = overlayPoint.y + scrollPos.top;
+    let x = overlayPoint.x;
+    let y = overlayPoint.y;
 
     // TODO(jelbourn): we don't want to always overwrite the transform property here,
     // because it will need to be used for animations.