feat: hook to "_Blockly.getMainWorkspace().showContextMenu" instead o…

…f "_Blockly.ContextMenu.show"; LennardF1989#28
p0lygun · Apr 25, 2023 · a39cd72 · a39cd72
1 parent 74295af
commit a39cd72
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/web/app.js b/src/web/app.js
@@ -1134,7 +1134,6 @@ BF2042Portal.Extensions = (function () {
         hookBlockDefinitions();
         hookContextMenu();
         hookWorkspaceSvg();
-
         initializeDocumentEvents();
         intializeBlockly();
 
@@ -1190,18 +1189,21 @@ BF2042Portal.Extensions = (function () {
     }
 
     function hookContextMenu() {
-        const originalShow = _Blockly.ContextMenu.show;
-
-        _Blockly.ContextMenu.show = (e, options, rtl) => {
+        if(!_Blockly.getMainWorkspace()){
+            setTimeout(hookContextMenu, 100);
+            return;
+        }
+        const originalShow = _Blockly.getMainWorkspace().showContextMenu
+        _Blockly.getMainWorkspace().showContextMenu = function (e) {
             lastContextMenu = {
-                e,
-                options,
-                rtl
+                e: e,
+                options: _Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
+                    _Blockly.ContextMenuRegistry.ScopeType.WORKSPACE, {workspace: _Blockly.getMainWorkspace()}
+                ),
+                rtl: _Blockly.getMainWorkspace().RTL
             };
-
-            updateMouseCoords(lastContextMenu.e);
-
-            return originalShow(e, options, rtl);
+            updateMouseCoords(e);
+            return originalShow.apply(this, arguments);
         }
     }
 
@@ -1500,7 +1502,6 @@ BF2042Portal.Extensions = (function () {
         let activeBlock;
 
         const workspace = _Blockly.getMainWorkspace();
-
         workspace.addChangeListener(function (e) {
             if (e.type === _Blockly.Events.CLICK || e.type === _Blockly.Events.SELECTED) {
                 if (shiftKey) {
@@ -1564,7 +1565,7 @@ BF2042Portal.Extensions = (function () {
         }
 
         // Gets the x and y position of the cursor relative to the workspace's parent svg element.
-        const mouseXY = _Blockly.utils.mouseToSvg(
+        const mouseXY = _Blockly.browserEvents.mouseToSvg(
             event,
             mainWorkspace.getParentSvg(),
             mainWorkspace.getInverseScreenCTM()