Skip to content

fix(cdk/drag-drop): incorrect index when returning item in mixed list #31592

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

fix(cdk/drag-drop): incorrect index when returning item in mixed list #31592

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
13 changes: 8 additions & 5 deletions src/cdk/drag-drop/sorting/mixed-sort-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,14 @@ export class MixedSortStrategy implements DropListSortStrategy {
* out automatically.
*/
enter(item: DragRef, pointerX: number, pointerY: number, index?: number): void {
// Remove the item from current set of items first so that it doesn't throw off the indexes
// further down in this method. See https://github.com/angular/components/issues/31505
const currentIndex = this._activeItems.indexOf(item);

if (currentIndex > -1) {
this._activeItems.splice(currentIndex, 1);
}

let enterIndex =
index == null || index < 0
? this._getItemIndexFromPointerPosition(item, pointerX, pointerY)
Expand All @@ -154,11 +162,6 @@ export class MixedSortStrategy implements DropListSortStrategy {
}

const targetItem = this._activeItems[enterIndex] as DragRef | undefined;
const currentIndex = this._activeItems.indexOf(item);

if (currentIndex > -1) {
this._activeItems.splice(currentIndex, 1);
}

if (targetItem && !this._dragDropRegistry.isDragging(targetItem)) {
this._activeItems.splice(enterIndex, 0, item);
Expand Down
Loading