diff --git a/package-lock.json b/package-lock.json index 2708e624..a6533e0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@types/p5": "^1.7.6", "@typescript-eslint/eslint-plugin": "^6.7.2", "@typescript-eslint/parser": "^6.7.2", - "blockly": "12.3.1", + "blockly": "^12.5.1", "chai": "^5.2.0", "eslint": "^8.49.0", "eslint-config-google": "^0.14.0", @@ -3285,9 +3285,9 @@ } }, "node_modules/blockly": { - "version": "12.3.1", - "resolved": "https://registry.npmjs.org/blockly/-/blockly-12.3.1.tgz", - "integrity": "sha512-BbWUcpqroY241XgSxTuAiEMHeIZ6u3+oD2zOATf3Fi+0NMWJ/MdMtuSkOcDCSk6Nc7WR3z5n9GHKqz2L+3kQOQ==", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/blockly/-/blockly-12.5.1.tgz", + "integrity": "sha512-etXLpUtEkcRibHGwIJ4BsvnIzMJJs0C0yPIjE/W0NCtj8ACha/a7Q9n7Ib6+j7N4EzQ0p28YPZMnypi5pNIj1g==", "dev": true, "license": "Apache-2.0", "peer": true, diff --git a/package.json b/package.json index 51741d0d..6f0ab699 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@types/p5": "^1.7.6", "@typescript-eslint/eslint-plugin": "^6.7.2", "@typescript-eslint/parser": "^6.7.2", - "blockly": "12.3.1", + "blockly": "^12.5.1", "chai": "^5.2.0", "eslint": "^8.49.0", "eslint-config-google": "^0.14.0", diff --git a/src/actions/action_menu.ts b/src/actions/action_menu.ts index b8c8ad70..5e1534da 100644 --- a/src/actions/action_menu.ts +++ b/src/actions/action_menu.ts @@ -65,8 +65,9 @@ export class ActionMenu { createSerializedKey(KeyCodes.ENTER, [KeyCodes.ALT]), createSerializedKey(KeyCodes.ENTER, [KeyCodes.META]), ], + allowCollision: true, }; - ShortcutRegistry.registry.register(menuShortcut); + ShortcutRegistry.registry.register(menuShortcut, true); } /**