Skip to content

Commit

Permalink
fix: allow splicing into shadow block stacks (#6939)
Browse files Browse the repository at this point in the history
* fix: allow splicing into shadow block stacks

* chore: format
  • Loading branch information
maribethb authored Mar 30, 2023
1 parent 9328eeb commit 69afe5b
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
5 changes: 3 additions & 2 deletions core/connection_checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,9 @@ export class ConnectionChecker implements IConnectionChecker {
}

// Don't offer to splice into a stack where the connected block is
// immovable.
if (b.targetBlock() && !b.targetBlock()!.isMovable()) {
// immovable, unless the block is a shadow block.
if (b.targetBlock() && !b.targetBlock()!.isMovable() &&
!b.targetBlock()!.isShadow()) {
return false;
}
break;
Expand Down
25 changes: 25 additions & 0 deletions tests/mocha/connection_checker_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,31 @@ suite('Connection checker', function() {
'Should connect two compatible stack blocks');
});

test('Connect to unmovable shadow block', function() {
// Remove original test blocks.
this.workspace.clear();

// Add the same test blocks, but this time block B is a shadow block.
Blockly.Xml.domToWorkspace(Blockly.utils.xml.textToDom(`<xml xmlns="https://developers.google.com/blockly/xml">
<block type="text_print" id="A" x="-76" y="-112">
<next>
<shadow type="text_print" id="B" movable="false">
</shadow>
</next>
</block>
<block type="text_print" id="C" x="47" y="-118"/>
</xml>`), this.workspace);
[this.blockA, this.blockB, this.blockC] = this.workspace.getAllBlocks(true);

// Try to connect blockC into the input connection of blockA, replacing blockB.
// This is allowed because shadow blocks can always be replaced, even though
// they are unmovable.
chai.assert.isTrue(
this.checker.doDragChecks(
this.blockC.previousConnection, this.blockA.nextConnection, 9000),
'Should connect in place of a shadow block');
});

test('Do not splice into unmovable stack', function() {
// Try to connect blockC above blockB. It shouldn't work because B is not movable
// and is already connected to A's nextConnection.
Expand Down

0 comments on commit 69afe5b

Please sign in to comment.