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: allow scrolling over #23696

Merged
merged 1 commit into from
Jul 6, 2020
Merged

Popover: allow scrolling over #23696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion packages/block-editor/src/components/block-list/insertion-point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ export default function InsertionPoint( {
focusOnMount={ false }
className="block-editor-block-list__insertion-point-popover"
__unstableSlotName="block-toolbar"
__unstableFixedPosition={ false }
>
<div
className="block-editor-block-list__insertion-point"
Expand Down
2 changes: 2 additions & 0 deletions packages/block-editor/src/components/block-list/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@

.block-editor-block-list__insertion-point-popover.is-without-arrow {
z-index: z-index(".block-editor-block-list__insertion-point-popover");
position: absolute;

.components-popover__content.components-popover__content { // Needs specificity.
background: none;
Expand All @@ -681,6 +682,7 @@

.components-popover.block-editor-block-list__block-popover {
z-index: z-index(".block-editor-block-list__block-popover");
position: absolute;

.components-popover__content {
margin: 0 !important;
Expand Down
22 changes: 10 additions & 12 deletions packages/components/src/popover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ function computeAnchorRect(
}

if ( anchorRef !== false ) {
if ( ! anchorRef ) {
if (
! anchorRef ||
! window.Range ||
! window.Element ||
! window.DOMRect
) {
return;
}

Expand Down Expand Up @@ -256,7 +261,6 @@ const Popover = ( {
__unstableSticky,
__unstableSlotName = SLOT_NAME,
__unstableObserveElement,
__unstableFixedPosition = true,
__unstableBoundaryParent,
/* eslint-enable no-unused-vars */
...contentProps
Expand All @@ -281,7 +285,6 @@ const Popover = ( {
setStyle( containerRef.current, 'left' );
setStyle( contentRef.current, 'maxHeight' );
setStyle( contentRef.current, 'maxWidth' );
setStyle( containerRef.current, 'position' );
return;
}

Expand All @@ -302,17 +305,16 @@ const Popover = ( {
return;
}

const { offsetParent, ownerDocument } = containerRef.current;

let relativeOffsetTop = 0;

// If there is a positioned ancestor element that is not the body,
// subtract the position from the anchor rect. If the position of
// the popover is fixed, the offset parent is null or the body
// element, in which case the position is relative to the viewport.
// See https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/offsetParent
if ( ! __unstableFixedPosition ) {
setStyle( containerRef.current, 'position', 'absolute' );

const { offsetParent } = containerRef.current;
if ( offsetParent && offsetParent !== ownerDocument.body ) {
const offsetParentRect = offsetParent.getBoundingClientRect();

relativeOffsetTop = offsetParentRect.top;
Expand All @@ -322,8 +324,6 @@ const Popover = ( {
anchor.width,
anchor.height
);
} else {
setStyle( containerRef.current, 'position' );
}

let boundaryElement;
Expand Down Expand Up @@ -396,8 +396,7 @@ const Popover = ( {
setAnimateOrigin( animateXAxis + ' ' + animateYAxis );
};

// Height may still adjust between now and the next tick.
const timeoutId = window.setTimeout( refresh );
Copy link
Member Author

@ellatrix ellatrix Jul 4, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Height is now continuously calculated since #23159.

refresh();

/*
* There are sometimes we need to reposition or resize the popover that
Expand Down Expand Up @@ -430,7 +429,6 @@ const Popover = ( {
}

return () => {
window.clearTimeout( timeoutId );
window.clearInterval( intervalHandle );
window.removeEventListener( 'resize', refresh );
window.removeEventListener( 'scroll', refresh, true );
Expand Down
10 changes: 8 additions & 2 deletions packages/components/src/popover/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ exports[`Popover should pass additional props to portaled element 1`] = `
<div>
<div>
<div
class="components-popover is-without-arrow"
class="components-popover components-animate__appear is-from-top is-from-left is-without-arrow"
data-x-axis="right"
data-y-axis="bottom"
role="tooltip"
style="top: 0px; left: 0px;"
>
<div
class="components-popover__content"
Expand All @@ -36,7 +39,10 @@ exports[`Popover should render content 1`] = `
<div>
<div>
<div
class="components-popover is-without-arrow"
class="components-popover components-animate__appear is-from-top is-from-left is-without-arrow"
data-x-axis="right"
data-y-axis="bottom"
style="top: 0px; left: 0px;"
>
<div
class="components-popover__content"
Expand Down
8 changes: 3 additions & 5 deletions packages/components/src/popover/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,12 @@ export function computePopoverYAxisPosition(
const scrollContainerEl =
getScrollContainer( anchorRef ) || document.body;
const scrollRect = scrollContainerEl.getBoundingClientRect();
const stickyPosition = scrollRect.top + height - relativeOffsetTop;

if ( anchorRect.top - height <= scrollRect.top ) {
if ( anchorRect.top <= stickyPosition ) {
return {
yAxis,
popoverTop: Math.min(
anchorRect.bottom - relativeOffsetTop,
scrollRect.top + height - relativeOffsetTop
),
popoverTop: Math.min( anchorRect.bottom, stickyPosition ),
};
}
}
Expand Down