Skip to content

fix: Update dnd to handle inert #8560

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
devongovett merged 1 commit into from
Jul 16, 2025
Merged

fix: Update dnd to handle inert #8560

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
10 changes: 5 additions & 5 deletions packages/@react-aria/dnd/src/DragManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ class DragSession {
...visibleDropTargets.flatMap(target => target.activateButtonRef?.current ? [target.element, target.activateButtonRef?.current] : [target.element])
], {shouldUseInert: true});

this.mutationObserver.observe(document.body, {subtree: true, attributes: true, attributeFilter: ['aria-hidden']});
this.mutationObserver.observe(document.body, {subtree: true, attributes: true, attributeFilter: ['aria-hidden', 'inert']});
}

next(): void {
Expand All @@ -437,7 +437,7 @@ class DragSession {
// If we've reached the end of the valid drop targets, cycle back to the original drag target.
// This lets the user cancel the drag in case they don't have an Escape key (e.g. iPad keyboard case).
if (index === this.validDropTargets.length - 1) {
if (!this.dragTarget.element.closest('[aria-hidden="true"]')) {
if (!this.dragTarget.element.closest('[aria-hidden="true"], [inert]')) {
this.setCurrentDropTarget(null);
this.dragTarget.element.focus();
} else {
Expand Down Expand Up @@ -472,7 +472,7 @@ class DragSession {
// If we've reached the start of the valid drop targets, cycle back to the original drag target.
// This lets the user cancel the drag in case they don't have an Escape key (e.g. iPad keyboard case).
if (index === 0) {
if (!this.dragTarget.element.closest('[aria-hidden="true"]')) {
if (!this.dragTarget.element.closest('[aria-hidden="true"], [inert]')) {
this.setCurrentDropTarget(null);
this.dragTarget.element.focus();
} else {
Expand Down Expand Up @@ -579,7 +579,7 @@ class DragSession {
cancel(): void {
this.setCurrentDropTarget(null);
this.end();
if (!this.dragTarget.element.closest('[aria-hidden="true"]')) {
if (!this.dragTarget.element.closest('[aria-hidden="true"], [inert]')) {
this.dragTarget.element.focus();
}

Expand Down Expand Up @@ -640,7 +640,7 @@ class DragSession {
function findValidDropTargets(options: DragTarget) {
let types = getTypes(options.items);
return [...dropTargets.values()].filter(target => {
if (target.element.closest('[aria-hidden="true"]')) {
if (target.element.closest('[aria-hidden="true"], [inert]')) {
return false;
}

Expand Down