Skip to content

fix: resolve IndexOutOfBounds and incorrect ordering when dragging po… #1006

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve IndexOutOfBounds and incorrect ordering when dragging po… #1006

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions packages/dockview-core/src/dockview/components/titlebar/tabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,10 @@ export class Tabs extends CompositeDisposable {
tab: IValueDisposable<Tab>,
index: number = this._tabs.length
): void {
if (index < 0 || index > this._tabs.length) {
throw new Error('invalid location');
}
// Clamp index to valid range to prevent IndexOutOfBounds errors
// This can happen when dragging panels from popouts where the original
// position calculations become stale after the source panel is removed
index = Math.max(0, Math.min(index, this._tabs.length));

this._tabsList.insertBefore(
tab.value.element,
Expand Down
11 changes: 10 additions & 1 deletion packages/dockview-core/src/dockview/dockviewComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,9 +2193,18 @@ export class DockviewComponent
// Check if destination group is empty - if so, force render the component
const isDestinationGroupEmpty = destinationGroup.model.size === 0;

// Fix for GitHub issue #1004: When dragging from popout windows,
// the destination index might be incorrect due to stale position calculations.
// For popout sources, we should validate and potentially adjust the index.
let adjustedIndex = destinationIndex;
if (sourceGroup.api.location.type === 'popout' && typeof destinationIndex === 'number') {
// Ensure the index is within valid bounds for the destination group
adjustedIndex = Math.max(0, Math.min(destinationIndex, destinationGroup.model.size));
}

this.movingLock(() =>
destinationGroup.model.openPanel(removedPanel, {
index: destinationIndex,
index: adjustedIndex,
skipSetActive: (options.skipSetActive ?? false) && !isDestinationGroupEmpty,
skipSetGroupActive: true,
})
Expand Down