Initialize the content size used in Popover computation

WordPress · Jun 18, 2020 · 01e8664 · 01e8664
1 parent 881b7f2
commit 01e8664
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/components/src/popover/index.js b/packages/components/src/popover/index.js
@@ -265,7 +265,6 @@ const Popover = ( {
 	const slot = useSlot( __unstableSlotName );
 	const isExpanded = expandOnMobile && isMobileViewport;
 	const [ containerResizeListener, contentSize ] = useResizeObserver();
-
 	noArrow = isExpanded || noArrow;
 
 	useEffect( () => {
@@ -330,6 +329,10 @@ const Popover = ( {
 				)?.parentNode;
 			}
 
+			const usedContentSize = ! contentSize.height
+				? contentRef.current.getBoundingClientRect()
+				: contentSize;
+
 			const {
 				popoverTop,
 				popoverLeft,
@@ -339,7 +342,7 @@ const Popover = ( {
 				contentWidth,
 			} = computePopoverPosition(
 				anchor,
-				contentSize,
+				usedContentSize,
 				position,
 				__unstableSticky,
 				containerRef.current,