Skip to content
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

fix: blocks not being returned to the correct layer if their drag is reverted with no parent #7998

Merged
merged 2 commits into from
Apr 8, 2024
+3 −0
Merged

fix: blocks not being returned to the correct layer if their drag is reverted with no parent #7998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7e403
fix: blocks not being returned to the correct drag layer if their dra…
BeksOmega Apr 3, 2024
9350f46
fix: delete test code
BeksOmega Apr 8, 2024
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
3 changes: 3 additions & 0 deletions core/dragging/block_drag_strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,9 @@ export class BlockDragStrategy implements IDragStrategy {
}
} else {
this.block.moveTo(this.startLoc!, ['drag']);
this.workspace
.getLayerManager()
?.moveOffDragLayer(this.block, layers.BLOCK);
// Blocks dragged directly from a flyout may need to be bumped into
// bounds.
bumpObjects.bumpIntoBounds(
Expand Down
8 changes: 8 additions & 0 deletions core/trashcan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,14 @@ export class Trashcan
};
return blockInfo;
}

wouldDelete(_element: IDraggable): boolean {
return false;
BeksOmega marked this conversation as resolved.
Show resolved Hide resolved
}

shouldPreventMove(_dragElement: IDraggable): boolean {
return true;
}
}

/** Width of both the trash can and lid images. */
Expand Down