Changed toolbox update event to include the workspace id in the event details.

Author: lizlooney

src/App.tsx

@@ -391,11 +391,13 @@ const AppContent: React.FC<AppContentProps> = ({ project, setProject }): React.J
   };
 
   /** Handles toolbox update requests from blocks */
-  const handleToolboxUpdateRequest = React.useCallback(() => {
-    if (blocksEditor.current && currentModule) {
-      blocksEditor.current.updateToolbox(shownPythonToolboxCategories);
+  const handleToolboxUpdateRequest = React.useCallback((e: Event) => {
+    const workspaceId = (e as CustomEvent).detail.workspaceId;
+    const correspondingEditor = editor.Editor.getEditorForBlocklyWorkspaceId(workspaceId);
+    if (correspondingEditor) {
+      correspondingEditor.updateToolbox(shownPythonToolboxCategories);
     }
-  }, [currentModule, shownPythonToolboxCategories, i18n.language]);
+  }, [shownPythonToolboxCategories, i18n.language]);
 
   // Add event listener for toolbox updates
   React.useEffect(() => {

src/blocks/mrc_mechanism_component_holder.ts

@@ -142,13 +142,13 @@ const MECHANISM_COMPONENT_HOLDER = {
       let blockMoveEvent = blockEvent as Blockly.Events.BlockMove;
       if (blockMoveEvent.reason?.includes('connect')) {
         setName(block);
-        updateToolboxAfterDelay();
+        updateToolboxAfterDelay(block);
       }
     }
     else {
       if (blockEvent.type == Blockly.Events.BLOCK_CHANGE) {
         setName(block);
-        updateToolboxAfterDelay();
+        updateToolboxAfterDelay(block);
       }
     }
   },
@@ -243,13 +243,17 @@ const MECHANISM_COMPONENT_HOLDER = {
 }
 
 let toolboxUpdateTimeout: NodeJS.Timeout | null = null;
-export function updateToolboxAfterDelay(){
+
+function updateToolboxAfterDelay(block: Blockly.BlockSvg) {
   if (toolboxUpdateTimeout) {
     clearTimeout(toolboxUpdateTimeout);
   }
   toolboxUpdateTimeout = setTimeout(() => {
     const event = new CustomEvent(TOOLBOX_UPDATE_EVENT, {
-      detail: { timestamp: Date.now() }
+      detail: {
+        timestamp: Date.now(),
+        workspaceId: block.workspace.id,
+      }
     });
     window.dispatchEvent(event);
     toolboxUpdateTimeout = null;

src/editor/editor.ts

@@ -495,6 +495,11 @@ export class Editor {
     return null;
   }
 
+  public static getEditorForBlocklyWorkspaceId(workspaceId: string): Editor | null {
+    const workspace = Blockly.Workspace.getById(workspaceId);
+    return workspace ? Editor.getEditorForBlocklyWorkspace(workspace) : null;
+  }
+
   public static getCurrentEditor(): Editor | null {
     return Editor.currentEditor;
   }