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: Don't visit collapsed blocks (#9090)

Browse Source 
* WIP on line by line navigation

Doesn't work, likely due to isValid check.

* Add all inputs to the list of siblings

* Fix formatting

* Add tests

* Remove dupe keys

* fix: Make blocks with display: none not focusable

* Undo changes to canBeFocused

* Don't traverse inputs that are invisible
This commit is contained in:
RoboErikG
2025-05-23 13:11:30 -07:00
committed by GitHub
parent 056aaf32d0
commit cc9384ae87
2 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/mocha/navigation_test.js
View File

@@ -369,15 +369,26 @@ suite('Navigation', function () {
this.blocks.secondBlock = secondBlock;
this.blocks.outputNextBlock = outputNextBlock;
const buttonBlock = this.workspace.newBlock('buttons');
const buttonInput1 = this.workspace.newBlock('field_input');
const buttonInput2 = this.workspace.newBlock('field_input');
const buttonBlock = this.workspace.newBlock('buttons', 'button_block');
const buttonInput1 = this.workspace.newBlock(
'field_input',
'button_input1',
);
const buttonInput2 = this.workspace.newBlock(
'field_input',
'button_input2',
);
const buttonNext = this.workspace.newBlock(
'input_statement',
'button_next',
);
buttonBlock.inputList[0].connection.connect(
buttonInput1.outputConnection,
);
buttonBlock.inputList[2].connection.connect(
buttonInput2.outputConnection,
);
buttonBlock.nextConnection.connect(buttonNext.previousConnection);
// Make buttons by adding a click handler
const clickHandler = function () {
return;
@@ -388,6 +399,7 @@ suite('Navigation', function () {
this.blocks.buttonBlock = buttonBlock;
this.blocks.buttonInput1 = buttonInput1;
this.blocks.buttonInput2 = buttonInput2;
this.blocks.buttonNext = buttonNext;
this.workspace.cleanUp();
});
@@ -505,17 +517,22 @@ suite('Navigation', function () {
});
test('fromBlockToFieldInNextInput', function () {
const field = this.blocks.buttonBlock.getField('BUTTON2');
const prevNode = this.navigator.getNextSibling(
const nextNode = this.navigator.getNextSibling(
this.blocks.buttonInput1,
);
assert.equal(prevNode, field);
assert.equal(nextNode, field);
});
test('fromBlockToFieldSkippingInput', function () {
const field = this.blocks.buttonBlock.getField('BUTTON3');
const prevNode = this.navigator.getNextSibling(
const nextNode = this.navigator.getNextSibling(
this.blocks.buttonInput2,
);
assert.equal(prevNode, field);
assert.equal(nextNode, field);
});
test('skipsChildrenOfCollapsedBlocks', function () {
this.blocks.buttonBlock.setCollapsed(true);
const nextNode = this.navigator.getNextSibling(this.blocks.buttonBlock);
assert.equal(nextNode.id, this.blocks.buttonNext.id);
});
});
@@ -645,6 +662,13 @@ suite('Navigation', function () {
);
assert.equal(prevNode, field);
});
test('skipsChildrenOfCollapsedBlocks', function () {
this.blocks.buttonBlock.setCollapsed(true);
const prevNode = this.navigator.getPreviousSibling(
this.blocks.buttonNext,
);
assert.equal(prevNode.id, this.blocks.buttonBlock.id);
});
});
suite('In', function () {
@@ -725,6 +749,11 @@ suite('Navigation', function () {
const inNode = this.navigator.getFirstChild(icons[0]);
assert.isNull(inNode);
});
test('skipsChildrenOfCollapsedBlocks', function () {
this.blocks.buttonBlock.setCollapsed(true);
const inNode = this.navigator.getFirstChild(this.blocks.buttonBlock);
assert.isNull(inNode);
});
});
suite('Out', function () {