Skip to content

Commit 76ee67c

Browse files
committed
Do not render fallback anchor if there is already a prop-derived anchor
1 parent 382b869 commit 76ee67c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

packages/components/src/popover/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ const Popover = (
215215

216216
const arrowRef = useRef( null );
217217

218+
const [ referenceElement, setReferenceElement ] = useState();
218219
const [ fallbackReferenceElement, setFallbackReferenceElement ] =
219220
useState();
220221
const [ referenceOwnerDocument, setReferenceOwnerDocument ] = useState();
@@ -377,6 +378,7 @@ const Popover = (
377378

378379
referenceCallbackRef( resultingReferenceElement );
379380

381+
setReferenceElement( resultingReferenceElement );
380382
setReferenceOwnerDocument( resultingReferenceOwnerDoc );
381383
}, [
382384
anchor,
@@ -494,7 +496,7 @@ const Popover = (
494496
content = <Fill name={ slotName }>{ content }</Fill>;
495497
}
496498

497-
if ( anchorRef || anchorRect ) {
499+
if ( referenceElement && referenceElement !== fallbackReferenceElement ) {
498500
return content;
499501
}
500502

0 commit comments

Comments
 (0)