Skip to content

Commit 75551a6

Browse files
committed
fix: Fix bug that prevented navigating into flyouts.
1 parent f92085b commit 75551a6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/actions/arrow_navigation.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ export class ArrowNavigation {
7979
// @ts-expect-error private method
8080
isHandled = toolbox && toolbox.selectChild();
8181
if (!isHandled && flyout) {
82-
Blockly.getFocusManager().focusTree(flyout.getWorkspace());
8382
this.navigation.defaultFlyoutCursorIfNeeded(workspace);
8483
}
8584
return true;

src/navigation.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,13 @@ export class Navigation {
306306

307307
const curNode = flyoutCursor.getCurNode();
308308
const sourceBlock = flyoutCursor.getSourceBlock();
309-
if (curNode && !this.isFlyoutItemDisposed(curNode, sourceBlock))
309+
if (
310+
curNode &&
311+
curNode.getFocusableTree() === flyout.getWorkspace() &&
312+
!this.isFlyoutItemDisposed(curNode, sourceBlock)
313+
) {
310314
return false;
315+
}
311316

312317
const flyoutContents = flyout.getContents();
313318
const defaultFlyoutItem =

0 commit comments

Comments
 (0)