fix: drag parent of shadow block #399
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
rachel-fenichel
requested review from
BenHenning
and removed request for
a team and
BenHenning
Collaborator
Author
|
@microbit-matt-hillsdon please review. |
| const curNode = workspace?.getCursor()?.getCurNode(); | ||
| let block = curNode?.getSourceBlock(); | ||
| if (!block) return undefined; | ||
| while (block && block.isShadow()) { |
Contributor
There was a problem hiding this comment.
Nit: Because we check !block before and in the loop, this test can just be block.isShadow(). Makes it a bit clearer that block is always defined after the loop.
Collaborator
Author
There was a problem hiding this comment.
It can return null from getParent. It'll be an error (see below), but still possible in the type system.
Contributor
microbit-matt-hillsdon
left a comment
microbit-matt-hillsdon
left a comment
There was a problem hiding this comment.
Approved.
Deployment as tested: https://drag-shadow.blockly-keyboard-experimentation.pages.dev/
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.
Fixes #395
When starting a drag, walk up the tree until the first non-shadow block and drag it. If there's no non-shadow block, throw because that's not supposed to happen.
This matches related code in core.
The core code can't handle this case because the drag strategy of the moving block needs to be patched. We're doing that in
mover.ts, and getting the correct block inmover.tsmeans that we don't have to track patching/unpatching the drag strategy on multiple blocks.