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

feat: Play error beeps when shortcuts fail (#9925)

Browse Source
This commit is contained in:
Aaron Dodson
2026-05-22 09:01:48 -07:00
committed by GitHub
parent 0b9efdac4d
commit 8e73862778
1 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/blockly/core/shortcut_items.ts
+41 -17
View File
@@ -108,15 +108,18 @@ export function registerDelete() {
name: names.DELETE,
preconditionFn(workspace, scope) {
const focused = scope.focusedNode;
return (
const result =
!workspace.isReadOnly() &&
focused != null &&
isIDeletable(focused) &&
focused.isDeletable() &&
!workspace.isDragging() &&
// Don't delete the block if a field editor is open
!getFocusManager().ephemeralFocusTaken()
);
!getFocusManager().ephemeralFocusTaken();
if (!result) {
workspace.getAudioManager().playErrorBeep();
}
return result;
},
callback(workspace, e, shortcut, scope) {
// Delete or backspace.
@@ -194,13 +197,16 @@ export function registerCopy() {
const targetWorkspace = workspace.isFlyout
? workspace.targetWorkspace
: workspace;
return (
const result =
!!focused &&
!!targetWorkspace &&
!targetWorkspace.isDragging() &&
!getFocusManager().ephemeralFocusTaken() &&
isCopyable(focused)
);
isCopyable(focused);
if (!result) {
workspace.getAudioManager().playErrorBeep();
}
return result;
},
callback(workspace, e, shortcut, scope) {
// Prevent the default copy behavior, which may beep or otherwise indicate
@@ -247,13 +253,16 @@ export function registerCut() {
name: names.CUT,
preconditionFn(workspace, scope) {
const focused = scope.focusedNode;
return (
const result =
!!focused &&
!workspace.isReadOnly() &&
!workspace.isDragging() &&
!getFocusManager().ephemeralFocusTaken() &&
isCuttable(focused)
);
isCuttable(focused);
if (!result) {
workspace.getAudioManager().playErrorBeep();
}
return result;
},
callback(workspace, e, shortcut, scope) {
const focused = scope.focusedNode;
@@ -308,13 +317,16 @@ export function registerPaste() {
const targetWorkspace = workspace.isFlyout
? workspace.targetWorkspace
: workspace;
return (
const result =
!!clipboard.getLastCopiedData() &&
!!targetWorkspace &&
!targetWorkspace.isReadOnly() &&
!targetWorkspace.isDragging() &&
!getFocusManager().ephemeralFocusTaken()
);
!getFocusManager().ephemeralFocusTaken();
if (!result) {
workspace.getAudioManager().playErrorBeep();
}
return result;
},
callback(workspace: WorkspaceSvg, e: Event) {
const copyData = clipboard.getLastCopiedData();
@@ -931,8 +943,17 @@ export function registerDisconnectBlock() {
]);
const disconnectShortcut: ShortcutRegistry.KeyboardShortcut = {
name: names.DISCONNECT,
preconditionFn: (workspace) =>
!workspace.isDragging() && !workspace.isReadOnly(),
preconditionFn: (workspace, scope) => {
const result =
!workspace.isDragging() &&
!workspace.isReadOnly() &&
scope.focusedNode instanceof BlockSvg;
if (!result) {
workspace.getAudioManager().playErrorBeep();
}
return result;
},
callback: (_workspace, event) => {
keyboardNavigationController.setIsActive(true);
const curNode = getFocusManager().getFocusedNode();
@@ -1186,12 +1207,15 @@ export function registerDuplicate() {
name: names.DUPLICATE,
preconditionFn: (workspace, scope) => {
const {focusedNode} = scope;
return (
const result =
!workspace.isDragging() &&
!workspace.isReadOnly() &&
!workspace.isFlyout &&
(focusedNode instanceof BlockSvg ? focusedNode.isDuplicatable() : true)
);
(focusedNode instanceof BlockSvg ? focusedNode.isDuplicatable() : true);
if (!result) {
workspace.getAudioManager().playErrorBeep();
}
return result;
},
callback: (workspace, _e, _shortcut, scope) => {
keyboardNavigationController.setIsActive(true);