[Google Blockly] Bump to 6.20210701.0 #42490
Merged
Conversation
This file contains 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
Comment on lines
52
to
56
| if (this.draggedConnectionManager_.wouldDeleteBlock()) { | ||
| this.workspace_.trashcan.setLidOpen(true); | ||
| } else { | ||
| this.workspace_.trashcan.setLidOpen(false); | ||
| } |
There was a problem hiding this comment.
nit: this could be simplified to
const wouldDelete = this.draggedConnectionManager_.wouldDeleteBlock();
this.workspace_.trashcan.setLidOpen(wouldDelete);| @@ -27,13 +27,6 @@ export default class WorkspaceSvg extends GoogleBlockly.WorkspaceSvg { | |||
| this.trashcan = new Blockly.Trashcan(this); | |||
| var svgTrashcan = this.trashcan.createDom(); | |||
| this.flyout_.svgGroup_.appendChild(svgTrashcan); | |||
| this.pluginManager_.addPlugin({ | |||
There was a problem hiding this comment.
checking my understanding -- we don't need to add the trashcan plugin anymore because we're registering CdoBlockDragger, which now controls the trashcan (basically, disabling and opening/closing the lid)?
There was a problem hiding this comment.
A lot of things have changed in Blockly internal logic (this is a major version bump), so I'm not 100% sure on the details here, but I think the key things are:
- The trashcan now adds itself to the ComponentManager (PluginManager was renamed to ComponentManager) in its own init method: https://github.com/google/blockly/blob/master/core/trashcan.js#L375. Since we subclass the trashcan, this was the change that made it so that we don't have to call
addPluginhere - Registering the
CdoBlockDraggeris necessary now becauseGestureinstantiates aBlockDraggerfrom the registry: https://github.com/google/blockly/blob/master/core/gesture.js#L442.
There was a problem hiding this comment.
ahhhh, okay, that makes more sense. thank you!
maddiedierker
approved these changes
Sep 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Release: https://github.com/google/blockly/releases/tag/6.20210701.0
This bump went pretty smoothly, there were just a couple tweaks needed for the trashcan:
BlockDraggerregistry.registerfor ourBlockDraggeroverrideverticalSpacing_instance variable was removed fromTrashcan, so we need to useinitialized_insteadI tested several Flappy levels on Mac / Chrome + Safari + Firefox, but it'd be great if people could test other OS/Browser combos if possible