Do not render fallback anchor if there is already a prop-derived anchor

WordPress · Aug 31, 2022 · fb73356 · fb73356
1 parent dde35cf
commit fb73356
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/components/src/popover/index.js b/packages/components/src/popover/index.js
@@ -215,6 +215,7 @@ const Popover = (
 
 	const arrowRef = useRef( null );
 
+	const [ referenceElement, setReferenceElement ] = useState();
 	const [ fallbackReferenceElement, setFallbackReferenceElement ] =
 		useState();
 	const [ referenceOwnerDocument, setReferenceOwnerDocument ] = useState();
@@ -377,6 +378,7 @@ const Popover = (
 
 		referenceCallbackRef( resultingReferenceElement );
 
+		setReferenceElement( resultingReferenceElement );
 		setReferenceOwnerDocument( resultingReferenceOwnerDoc );
 	}, [
 		anchor,
@@ -500,7 +502,7 @@ const Popover = (
 		content = <Fill name={ slotName }>{ content }</Fill>;
 	}
 
-	if ( anchorRef || anchorRect ) {
+	if ( referenceElement && referenceElement !== fallbackReferenceElement ) {
 		return content;
 	}