Skip to content

Fix popover scroll hook’s simultaneous scrolling #71468

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

Merged
stokesman merged 2 commits into from
Sep 5, 2025
Merged

Fix popover scroll hook’s simultaneous scrolling #71468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a03652c
Defer scrolling to wheel event target if it has overflow
stokesman Sep 1, 2025
ea03927
Remove event scroll container caching; test containment
stokesman Sep 3, 2025
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
12 changes: 10 additions & 2 deletions packages/block-editor/src/components/block-popover/use-popover-scroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,22 @@ function usePopoverScroll( contentRef ) {
const effect = useRefEffect(
( node ) => {
function onWheel( event ) {
const { deltaX, deltaY } = event;
const { deltaX, deltaY, target } = event;
const contentEl = contentRef.current;
let scrollContainer = scrollContainerCache.get( contentEl );
if ( ! scrollContainer ) {
scrollContainer = getScrollContainer( contentEl );
scrollContainerCache.set( contentEl, scrollContainer );
}
scrollContainer.scrollBy( deltaX, deltaY );
// Finds a scrollable ancestor of the event’s target. It's not cached because the
// it may not remain scrollable due to popover position changes. The cache is also
// less likely to be utilized because the target may be different every event.
const eventScrollContainer = getScrollContainer( target );
// Scrolls “through” the popover only if another contained scrollable area isn’t
// in front of it. This is to avoid scrolling both containers simultaneously.
if ( ! node.contains( eventScrollContainer ) ) {
scrollContainer.scrollBy( deltaX, deltaY );
}
}
// Tell the browser that we do not call event.preventDefault
// See https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#improving_scrolling_performance_with_passive_listeners
Expand Down
Loading