Popover: fix __unstableBoundaryParent (#35082)

WordPress · Oct 8, 2021 · 0fdb83c · 0fdb83c
1 parent 71ebf54
commit 0fdb83c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/components/src/popover/index.js b/packages/components/src/popover/index.js
@@ -326,9 +326,7 @@ const Popover = (
 
 			let boundaryElement;
 			if ( __unstableBoundaryParent ) {
-				boundaryElement = containerRef.current.closest(
-					'.popover-slot'
-				)?.parentNode;
+				boundaryElement = containerRef.current.parentElement;
 			}
 
 			const usedContentSize = ! contentSize.height

diff --git a/packages/components/src/popover/utils.js b/packages/components/src/popover/utils.js
@@ -139,8 +139,10 @@ export function computePopoverXAxisPosition(
 	}
 
 	if ( boundaryElement ) {
-		const boundaryRect = boundaryElement.getBoundingClientRect();
-		popoverLeft = Math.min( popoverLeft, boundaryRect.right - width );
+		popoverLeft = Math.min(
+			popoverLeft,
+			boundaryElement.offsetLeft + boundaryElement.offsetWidth - width
+		);
 
 		// Avoid the popover being position beyond the left boundary if the
 		// direction is left to right.