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.

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

chore: Merge master back into develop following v9.3.2 release #6956

Merged
merged 4 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions core/block_dragger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ export class BlockDragger implements IBlockDragger {

/** Fire a move event at the end of a block drag. */
protected fireMoveEvent_() {
if (this.draggingBlock_.isDeadOrDying()) return;
const event = new (eventUtils.get(eventUtils.BLOCK_MOVE))(
this.draggingBlock_) as BlockMove;
event.oldCoordinate = this.startXY_;
Expand Down
14 changes: 0 additions & 14 deletions core/mutator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -460,21 +460,7 @@ export class Mutator extends Icon {
const block = this.getBlock();
const oldExtraState = BlockChange.getExtraBlockState_(block);

// Switch off rendering while the source block is rebuilt.
const savedRendered = block.rendered;
// TODO(#4288): We should not be setting the rendered property to false.
block.rendered = false;

// Allow the source block to rebuild itself.
block.compose!(this.rootBlock);
// Restore rendering and show the changes.
block.rendered = savedRendered;
// Mutation may have added some elements that need initializing.
block.initSvg();

if (block.rendered) {
block.render();
}

const newExtraState = BlockChange.getExtraBlockState_(block);
if (oldExtraState !== newExtraState) {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blockly",
"version": "9.3.1",
"version": "9.3.2",
"description": "Blockly is a library for building visual programming editors.",
"keywords": [
"blockly"
Expand Down