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

fix: Skip invisible inputs in the field navigation policy (#9092)

Browse Source 
* Skip over hidden inputs when navigating from a field

* Add tests and fix implementation
This commit is contained in:
RoboErikG
2025-05-28 08:16:54 -07:00
committed by GitHub
parent edf344c542
commit d5a4522dd2
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/keyboard_nav/field_navigation_policy.ts
View File

@@ -48,12 +48,14 @@ export class FieldNavigationPolicy implements INavigationPolicy<Field<any>> {
let fieldIdx = input.fieldRow.indexOf(current) + 1;
for (let i = curIdx; i < block.inputList.length; i++) {
const newInput = block.inputList[i];
const fieldRow = newInput.fieldRow;
if (fieldIdx < fieldRow.length) return fieldRow[fieldIdx];
fieldIdx = 0;
if (newInput.connection?.targetBlock()) {
return newInput.connection.targetBlock() as BlockSvg;
if (newInput.isVisible()) {
const fieldRow = newInput.fieldRow;
if (fieldIdx < fieldRow.length) return fieldRow[fieldIdx];
if (newInput.connection?.targetBlock()) {
return newInput.connection.targetBlock() as BlockSvg;
}
}
fieldIdx = 0;
}
return null;
}
@@ -73,12 +75,13 @@ export class FieldNavigationPolicy implements INavigationPolicy<Field<any>> {
let fieldIdx = parentInput.fieldRow.indexOf(current) - 1;
for (let i = curIdx; i >= 0; i--) {
const input = block.inputList[i];
if (input.connection?.targetBlock() && input !== parentInput) {
return input.connection.targetBlock() as BlockSvg;
if (input.isVisible()) {
if (input.connection?.targetBlock() && input !== parentInput) {
return input.connection.targetBlock() as BlockSvg;
}
const fieldRow = input.fieldRow;
if (fieldIdx > -1) return fieldRow[fieldIdx];
}
const fieldRow = input.fieldRow;
if (fieldIdx > -1) return fieldRow[fieldIdx];
// Reset the fieldIdx to the length of the field row of the previous
// input.
if (i - 1 >= 0) {

14
tests/mocha/navigation_test.js
View File

@@ -534,6 +534,13 @@ suite('Navigation', function () {
const nextNode = this.navigator.getNextSibling(this.blocks.buttonBlock);
assert.equal(nextNode.id, this.blocks.buttonNext.id);
});
test('fromFieldSkipsHiddenInputs', function () {
this.blocks.buttonBlock.inputList[2].setVisible(false);
const fieldStart = this.blocks.buttonBlock.getField('BUTTON2');
const fieldEnd = this.blocks.buttonBlock.getField('BUTTON3');
const nextNode = this.navigator.getNextSibling(fieldStart);
assert.equal(nextNode.name, fieldEnd.name);
});
});
suite('Previous', function () {
@@ -669,6 +676,13 @@ suite('Navigation', function () {
);
assert.equal(prevNode.id, this.blocks.buttonBlock.id);
});
test('fromFieldSkipsHiddenInputs', function () {
this.blocks.buttonBlock.inputList[2].setVisible(false);
const fieldStart = this.blocks.buttonBlock.getField('BUTTON3');
const fieldEnd = this.blocks.buttonBlock.getField('BUTTON2');
const nextNode = this.navigator.getPreviousSibling(fieldStart);
assert.equal(nextNode.name, fieldEnd.name);
});
});
suite('In', function () {