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

fix: Fix bug that prevented keyboard navigation in flyouts. (#8687)

Browse Source 
* fix: Fix bug that prevented keyboard navigation in flyouts.

* refactor: Add an `isFocusable()` method to FlyoutItem.
This commit is contained in:
Aaron Dodson
2025-01-09 14:31:51 -08:00
committed by GitHub
parent 80a6d85c26
commit 75efba92e3
12 changed files with 203 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/keyboard_nav/ast_node.ts
View File

@@ -17,8 +17,8 @@ import {BlockSvg} from '../block_svg.js';
import type {Connection} from '../connection.js';
import {ConnectionType} from '../connection_type.js';
import type {Field} from '../field.js';
import {FlyoutItem} from '../flyout_base.js';
import {FlyoutButton} from '../flyout_button.js';
import type {FlyoutItem} from '../flyout_item.js';
import type {Input} from '../inputs/input.js';
import type {IASTNodeLocation} from '../interfaces/i_ast_node_location.js';
import type {IASTNodeLocationWithBlock} from '../interfaces/i_ast_node_location_with_block.js';
@@ -348,10 +348,11 @@ export class ASTNode {
);
if (!nextItem) return null;
if (nextItem.element instanceof FlyoutButton) {
return ASTNode.createButtonNode(nextItem.element);
} else if (nextItem.element instanceof BlockSvg) {
return ASTNode.createStackNode(nextItem.element);
const element = nextItem.getElement();
if (element instanceof FlyoutButton) {
return ASTNode.createButtonNode(element);
} else if (element instanceof BlockSvg) {
return ASTNode.createStackNode(element);
}
return null;
@@ -373,13 +374,13 @@ export class ASTNode {
const currentIndex = flyoutContents.findIndex((item: FlyoutItem) => {
if (
currentLocation instanceof BlockSvg &&
item.element === currentLocation
item.getElement() === currentLocation
) {
return true;
}
if (
currentLocation instanceof FlyoutButton &&
item.element === currentLocation
item.getElement() === currentLocation
) {
return true;
}
@@ -388,7 +389,17 @@ export class ASTNode {
if (currentIndex < 0) return null;
const resultIndex = forward ? currentIndex + 1 : currentIndex - 1;
let resultIndex = forward ? currentIndex + 1 : currentIndex - 1;
// The flyout may contain non-focusable elements like spacers or custom
// items. If the next/previous element is one of those, keep looking until a
// focusable element is encountered.
while (
resultIndex >= 0 &&
resultIndex < flyoutContents.length &&
!flyoutContents[resultIndex].isFocusable()
) {
resultIndex += forward ? 1 : -1;
}
if (resultIndex === -1 || resultIndex === flyoutContents.length) {
return null;
}