Move fix to getBoundingClientRect

ciampo · Sep 14, 2022 · f3fe19b · f3fe19b
1 parent 5c6d8dd
commit f3fe19b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/packages/dom/src/utils/getBoundingClientRect.ts b/packages/dom/src/utils/getBoundingClientRect.ts
@@ -27,14 +27,25 @@ export function getBoundingClientRect(
   const win = isElement(element) ? getWindow(element) : window;
   const addVisualOffsets = !isLayoutViewport() && isFixedStrategy;
 
+  const ownerDocOffset = {x: 0, y: 0};
+  if (win.frameElement) {
+    const iFrameBCR = win.frameElement.getBoundingClientRect();
+    ownerDocOffset.x = iFrameBCR.left;
+    ownerDocOffset.y = iFrameBCR.top;
+  }
+
   const x =
-    (clientRect.left +
-      (addVisualOffsets ? win.visualViewport?.offsetLeft ?? 0 : 0)) /
-    scaleX;
+    (
+      clientRect.left +
+      (addVisualOffsets ? win.visualViewport?.offsetLeft ?? 0 : 0) +
+      ownerDocOffset.x
+    ) / scaleX;
   const y =
-    (clientRect.top +
-      (addVisualOffsets ? win.visualViewport?.offsetTop ?? 0 : 0)) /
-    scaleY;
+    (
+      clientRect.top +
+      (addVisualOffsets ? win.visualViewport?.offsetTop ?? 0 : 0) +
+      ownerDocOffset.y
+    ) / scaleY;
   const width = clientRect.width / scaleX;
   const height = clientRect.height / scaleY;
 

diff --git a/packages/dom/src/utils/getRectRelativeToOffsetParent.ts b/packages/dom/src/utils/getRectRelativeToOffsetParent.ts
@@ -52,19 +52,9 @@ export function getRectRelativeToOffsetParent(
     }
   }
 
-  const ownerDocOffset = {x: 0, y: 0};
-
-  // TODO: improve checks
-  if (element?.ownerDocument?.defaultView?.frameElement) {
-    const bcr =
-      element.ownerDocument.defaultView.frameElement.getBoundingClientRect();
-    ownerDocOffset.x = bcr.left;
-    ownerDocOffset.y = bcr.top;
-  }
-
   return {
-    x: rect.left + scroll.scrollLeft - offsets.x + ownerDocOffset.x,
-    y: rect.top + scroll.scrollTop - offsets.y + ownerDocOffset.y,
+    x: rect.left + scroll.scrollLeft - offsets.x,
+    y: rect.top + scroll.scrollTop - offsets.y,
     width: rect.width,
     height: rect.height,
   };