Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Popover: don't render fallback anchor if anchorRef is defined #19308

Merged
merged 2 commits into from
Dec 23, 2019
Merged

Popover: don't render fallback anchor if anchorRef is defined #19308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3abd8cb
Popover: don't render fallback anchor if anchorRef is defined
ellatrix Dec 23, 2019
e4f9cb2
include anchorRect
ellatrix Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/components/src/popover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ const Popover = ( {
onKeyDown={ maybeClose }
ref={ containerRef }
>
{ isExpanded && <ScrollLock /> }
{ isExpanded && (
<div className="components-popover__header">
<span className="components-popover__header-title">
Expand Down Expand Up @@ -493,10 +494,13 @@ const Popover = ( {
content = <Fill name={ __unstableSlotName }>{ content }</Fill>;
}

if ( anchorRef || anchorRect ) {
return content;
}

return (
<span ref={ anchorRefFallback }>
{ content }
{ isMobileViewport && expandOnMobile && <ScrollLock /> }
</span>
);
} }
Expand Down