Skip to content

fix: (legacy version) fix utils used for calculating scroll offsets inside of iframes #2017

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

Open
istateside wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −6
Open

fix: (legacy version) fix utils used for calculating scroll offsets inside of iframes #2017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e3e2b3
fix: fix utils used for calculating scroll offsets inside of iframes
istateside Apr 16, 2026
94128e6
commit changeset
istateside Apr 16, 2026
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: 6 additions & 0 deletions .changeset/smooth-tips-sell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@dnd-kit/core': patch
'@dnd-kit/utilities': patch
---

Fix scroll calculations for draggable elements in a different frame context than the execution context
11 changes: 6 additions & 5 deletions packages/core/src/utilities/scroll/getScrollableElement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ export function getScrollableElement(element: EventTarget | null) {
return null;
}

if (
isDocument(element) ||
element === getOwnerDocument(element).scrollingElement
) {
return window;
if (isDocument(element)) {
return element.defaultView ?? window;
}

if (element === getOwnerDocument(element).scrollingElement) {
return getOwnerDocument(element)?.defaultView ?? window;
}

if (isHTMLElement(element)) {
Expand Down
6 changes: 5 additions & 1 deletion packages/utilities/src/execution-context/getWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ export function getWindow(target: Event['target']): typeof window {
return window;
}

return target.ownerDocument?.defaultView ?? window;
let ownerDoc = target.ownerDocument;
Copy link
Copy Markdown
Author

@istateside istateside Apr 27, 2026

Choose a reason for hiding this comment

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

This handles when target is the Document object itself

if (!ownerDoc) {
ownerDoc = 'documentElement' in target ? target : null;
}
return ownerDoc?.defaultView ?? window;
}