CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-05 08:00:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow splicing into shadow block stacks (#6939)

Browse Source 
* fix: allow splicing into shadow block stacks

* chore: format

(cherry picked from commit 69afe5b60f)
This commit is contained in:
Maribeth Bottorff
2023-03-30 13:32:57 -07:00
committed by Beka Westberg
parent 9c9aef1d23
commit 8e1890a93c
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/connection_checker.ts
View File

@@ -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;

25
tests/mocha/connection_checker_test.js
View File

@@ -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.