Skip to content

fix: Fix stack navigation with immovable blocks. #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gonfunko merged 1 commit into from
Oct 17, 2025
Merged

fix: Fix stack navigation with immovable blocks. #761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions src/actions/stack_navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

import {ShortcutRegistry, WorkspaceSvg, utils} from 'blockly/core';
import {
ShortcutRegistry,
WorkspaceSvg,
BlockSvg,
navigateStacks,
isSelectable,
utils,
} from 'blockly/core';
import * as Constants from '../constants';

/**
Expand All @@ -16,26 +23,13 @@ export class StackNavigationAction {

install() {
const preconditionFn = (workspace: WorkspaceSvg) =>
!!getCurNodeRoot(workspace);

function getCurNodeRoot(workspace: WorkspaceSvg) {
const cursor = workspace.getCursor();
// The fallback case includes workspace comments.
return cursor.getSourceBlock()?.getRootBlock() ?? cursor.getCurNode();
}
!!this.getCurNodeRoot(workspace);

const previousStackShortcut: ShortcutRegistry.KeyboardShortcut = {
name: Constants.SHORTCUT_NAMES.PREVIOUS_STACK,
preconditionFn,
callback: (workspace) => {
const curNodeRoot = getCurNodeRoot(workspace);
if (!curNodeRoot) return false;
const prevRoot = workspace
.getNavigator()
.getPreviousSibling(curNodeRoot);
if (!prevRoot) return false;
workspace.getCursor().setCurNode(prevRoot);
return true;
return this.navigate(workspace, -1);
},
keyCodes: [utils.KeyCodes.B],
};
Expand All @@ -44,12 +38,7 @@ export class StackNavigationAction {
name: Constants.SHORTCUT_NAMES.NEXT_STACK,
preconditionFn,
callback: (workspace) => {
const curNodeRoot = getCurNodeRoot(workspace);
if (!curNodeRoot) return false;
const nextRoot = workspace.getNavigator().getNextSibling(curNodeRoot);
if (!nextRoot) return false;
workspace.getCursor().setCurNode(nextRoot);
return true;
return this.navigate(workspace, 1);
},
keyCodes: [utils.KeyCodes.N],
};
Expand All @@ -60,6 +49,27 @@ export class StackNavigationAction {
this.stackShortcuts.push(nextStackShortcut);
}

private getCurNodeRoot(workspace: WorkspaceSvg) {
const cursor = workspace.getCursor();
// The fallback case includes workspace comments.
return cursor.getSourceBlock()?.getRootBlock() ?? cursor.getCurNode();
}

private navigate(workspace: WorkspaceSvg, delta: number) {
const curNodeRoot = this.getCurNodeRoot(workspace);
if (!curNodeRoot || !isSelectable(curNodeRoot)) {
return false;
}

let nextRoot = navigateStacks(curNodeRoot, delta);
if (!nextRoot) return false;
if (nextRoot instanceof BlockSvg) {
nextRoot = nextRoot.getRootBlock();
}
workspace.getCursor().setCurNode(nextRoot);
return true;
}

/**
* Unregisters the shortcut.
*/
Expand Down
Loading