fix: Fix bug in BlockSvg.prototype.setParent
#8934
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add tests for scenarios where block(s) unrelated to the block being disconnected has/have been marked as as being dragged. Due to a bug in BlockSvg.prototype.setParent, one of these fails in the case that the dragging block is not a top block. Also add a check to assertNonParentAndOrphan to check that the orphan block's SVG root's parent is the workspace's canvass (i.e., that orphan is a top-level block in the DOM too).
Fix an incorrect assumption in setParent: the topmost block whose root SVG element has the blocklyDragging class may not actually be a top-level block.
rachel-fenichel
approved these changes
Apr 28, 2025
Collaborator
rachel-fenichel
left a comment
rachel-fenichel
left a comment
There was a problem hiding this comment.
LGTM after minor fixes.
core/block_svg.ts
Outdated
| | SVGElement | ||
| | null | ||
| | undefined; | ||
| const canvass = this.workspace.getCanvas(); |
Collaborator
There was a problem hiding this comment.
Nit: canvass - > canvas
core/dragging/block_drag_strategy.ts
Outdated
| return; | ||
| } | ||
|
|
||
| this.connectionPreviewer!.hidePreview(); |
Collaborator
There was a problem hiding this comment.
Switch to ?. instead of !. while you're at it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The basics
The details
Resolves
Fix an incorrect assumption in
setParentwhen handling.setParent(null)calls.Fixes #8853.
(But see comments on that bug for detail.)
Proposed Changes
BlockSvg.prototype.setParent, when setting parent tonull, check to see if the top-mostblocklyDraggingelement is in fact a direct child of the canvass before attempting to insert the new top-level block ahead of it in the canvass's contents.BlockDragStragegy.prototype.revertDrag, callconnectionPreviewer.hidePreview()earlier, before attempting to reconnect the dragged block to its original parent. Not strictly necessary but makes more sense.BlockSvgandBlockDragStrategy.Reason for Changes
The topmost block whose root SVG element has the
blocklyDraggingclass may not actually be a top-level block on the workspace, but the existing implementation assumed that was true and would throw an error if it wasn't. This resulted in problems when reverting a drag if an insertion marker was displayed.Test Coverage
Adds two new tests for
setParent(one of which actually caught a bug that existed in an earlier version of the fix in this PR!)