add saving of blocks before changing language

Author: alan412

src/App.tsx

@@ -309,6 +309,12 @@ const App: React.FC = (): React.JSX.Element => {
     }
 
     blocksEditor.current = new editor.Editor(newWorkspace, generatorContext.current, storage);
+    
+    // Set the current module in the editor after creating it
+    if (currentModule) {
+      blocksEditor.current.loadModuleBlocks(currentModule);
+    }
+    
     blocksEditor.current.updateToolbox(shownPythonToolboxCategories);
   };
 
@@ -353,6 +359,31 @@ const App: React.FC = (): React.JSX.Element => {
     }
   }, [project]);
 
+  // Handle language changes with automatic saving
+  React.useEffect(() => {
+    const handleLanguageChange = async () => {
+      // Save current blocks before language change
+      if (currentModule && areBlocksModified()) {
+        try {
+          await saveBlocks();
+        } catch (e) {
+          console.error('Failed to save blocks before language change:', e);
+        }
+      }
+      
+      // Update toolbox after language change
+      if (blocksEditor.current) {
+        blocksEditor.current.updateToolbox(shownPythonToolboxCategories);
+      }
+    };
+
+    i18n.on('languageChanged', handleLanguageChange);
+
+    return () => {
+      i18n.off('languageChanged', handleLanguageChange);
+    };
+  }, [currentModule, shownPythonToolboxCategories, i18n]);
+
   const { Sider, Content } = Antd.Layout;
 
   return (

src/reactComponents/BlocklyComponent.tsx

@@ -140,6 +140,8 @@ const BlocklyComponent = React.forwardRef<BlocklyComponentType | null, BlocklyCo
         if (!workspaceRef.current) {
           return;
         }
+        // Save workspace state
+        const workspaceXml = Blockly.Xml.workspaceToDom(workspaceRef.current);
 
         // Set new locale
         switch (i18n.language) {
@@ -153,30 +155,33 @@ const BlocklyComponent = React.forwardRef<BlocklyComponentType | null, BlocklyCo
             Blockly.setLocale(En as any);
             break;
         }
-        
         // Apply custom tokens
         Blockly.setLocale(customTokens(t));
 
-        // Save workspace state
-        const workspaceXml = Blockly.Xml.workspaceToDom(workspaceRef.current);
-        
         // Clear the workspace
         workspaceRef.current.clear();
 
-        // Restore workspace with new locale (blocks will be recreated with new text)
-        if (workspaceXml.hasChildNodes()) {
-          Blockly.Xml.domToWorkspace(workspaceXml, workspaceRef.current);
-        }
-        
-        // Refresh the toolbox
-        const toolbox = workspaceRef.current.getToolbox();
-        if (toolbox) {
-          // Force toolbox to rebuild with new locale
-          toolbox.refreshSelection();
+        // Force complete toolbox rebuild by calling onWorkspaceRecreated AFTER locale is set
+        if (props.onWorkspaceRecreated) {
+          props.onWorkspaceRecreated(workspaceRef.current);
         }
-        
-        // Trigger workspace refresh
-        Blockly.svgResize(workspaceRef.current);
+               
+        // Small delay to ensure toolbox is rebuilt before restoring blocks
+        setTimeout(() => {
+          if (workspaceRef.current && workspaceXml.hasChildNodes()) {
+            Blockly.Xml.domToWorkspace(workspaceXml, workspaceRef.current);
+          }
+
+          // Final refresh
+          const toolbox = workspaceRef.current!.getToolbox();
+          if (toolbox && toolbox.refreshSelection) {
+            toolbox.refreshSelection();
+          }
+
+          if (workspaceRef.current) {
+            Blockly.svgResize(workspaceRef.current);            
+          }
+        }, 10);
       };
 
       /** Initializes the Blockly workspace. */