Skip to content

chore: merge develop into add-screen-reader #9360

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
maribethb merged 1 commit into from
Sep 12, 2025
Merged

chore: merge develop into add-screen-reader #9360

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"devDependencies": {
"@blockly/block-test": "^7.0.2",
"@blockly/dev-tools": "^9.0.2",
"@blockly/keyboard-navigation": "^3.0.1",
"@blockly/theme-modern": "^7.0.1",
"@hyperjump/browser": "^1.1.4",
"@hyperjump/json-schema": "^1.5.0",
Expand Down
30 changes: 30 additions & 0 deletions tests/playgrounds/advanced_playground.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
await loadScript(
'../../node_modules/@blockly/theme-modern/dist/index.js',
);
await loadScript(
'../../node_modules/@blockly/keyboard-navigation/dist/index.js',
);

let kbNavigation;

function start() {
setBackgroundColour();
Expand Down Expand Up @@ -47,6 +52,28 @@
// Refresh theme.
ws.setTheme(ws.getTheme());
});

// Keyboard navigation options.
const kbOptions = {
'Enable keyboard navigation': false,
};
gui.remember(kbOptions);
gui.add(kbOptions, 'Enable keyboard navigation').onChange((enabled) => {
setupKeyboardNav(enabled, playground);
});

// Set up keyboard navigation on page load
setupKeyboardNav(kbOptions['Enable keyboard navigation'], playground);
}

function setupKeyboardNav(enabled, playground) {
if (enabled) {
kbNavigation = new KeyboardNavigation(playground.getWorkspace());
} else {
if (kbNavigation) {
kbNavigation.dispose();
}
}
}

function initPlayground() {
Expand Down Expand Up @@ -101,6 +128,8 @@
};

Blockly.ContextMenuItems.registerCommentOptions();
KeyboardNavigation.registerKeyboardNavigationStyles();
// TODO: register the navigation-deferring toolbox.

createPlayground(
document.getElementById('root'),
Expand Down Expand Up @@ -153,6 +182,7 @@
</style>
</head>
<body>
<div id="shortcuts"></div>
<div id="root"></div>
</body>
</html>
Loading