Skip to content

fix(dnd): Virtualized Tree DnD fixes 2 #8550

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
reidbarber merged 2 commits into from
Jul 15, 2025
Merged

fix(dnd): Virtualized Tree DnD fixes 2 #8550

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27032fc
skip non-item nodes in useDndPersistedKeys
reidbarber Jul 15, 2025
c3703d7
persist last descendant key for 'after' last key in collection
reidbarber Jul 15, 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
15 changes: 13 additions & 2 deletions packages/react-aria-components/src/DragAndDrop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export function useDndPersistedKeys(selectionManager: MultipleSelectionManager,
if (dropState.target.dropPosition === 'after') {
// Normalize to the "before" drop position since we only render those to the DOM.
let nextKey = dropState.collection.getKeyAfter(dropTargetKey);
let lastDescendantKey: Key | null = null;
if (nextKey != null) {
let targetLevel = dropState.collection.getItem(dropTargetKey)?.level ?? 0;
// Skip over any rows that are descendants of the target ("after" position should be after all children)
Expand All @@ -85,16 +86,26 @@ export function useDndPersistedKeys(selectionManager: MultipleSelectionManager,
if (!node) {
break;
}
// Stop once we find a node at the same level or higher
// Skip over non-item nodes (e.g., loaders) since they can't be drop targets.
// eslint-disable-next-line max-depth
if (node.type !== 'item') {
nextKey = dropState.collection.getKeyAfter(nextKey);
continue;
}

// Stop once we find an item at the same level or higher
// eslint-disable-next-line max-depth
if ((node.level ?? 0) <= targetLevel) {
break;
}

lastDescendantKey = nextKey;
nextKey = dropState.collection.getKeyAfter(nextKey);
}
}

dropTargetKey = nextKey ?? dropTargetKey;
// If nextKey is null (end of collection), use the last descendant
dropTargetKey = nextKey ?? lastDescendantKey ?? dropTargetKey;
}
}

Expand Down