Merge remote-tracking branch 'gonfunko/modern-blockly' into spork

Author: cwillisf

src/containers/blocks.jsx

@@ -299,6 +299,7 @@ class Blocks extends React.Component {
             .then(() => {
                 this.workspace.getFlyout().setRecyclingEnabled(false);
                 this.props.vm.refreshWorkspace();
+                this.requestToolboxUpdate();
                 this.withToolboxUpdates(() => {
                     this.workspace.getFlyout().setRecyclingEnabled(true);
                 });
@@ -316,27 +317,28 @@ class Blocks extends React.Component {
         const selectedCategoryScrollPosition =
             this.workspace
                 .getFlyout()
-                .getCategoryScrollPosition(selectedCategoryName).y * scale;
+                .getCategoryScrollPosition(selectedCategoryName) * scale;
         const offsetWithinCategory =
             this.workspace.getFlyout().getWorkspace().getMetrics().viewTop -
             selectedCategoryScrollPosition;
 
         this.workspace.updateToolbox(this.props.toolboxXML);
+        this.workspace.getToolbox().runAfterRerender(() => {
+            const newCategoryScrollPosition = this.workspace
+                .getFlyout()
+                .getCategoryScrollPosition(selectedCategoryName);
+            if (newCategoryScrollPosition) {
+                this.workspace
+                    .getFlyout()
+                    .getWorkspace()
+                    .scrollbar.setY(
+                        newCategoryScrollPosition * scale + offsetWithinCategory
+                    );
+            }
+        });
         this.workspace.getToolbox().forceRerender();
         this._renderedToolboxXML = this.props.toolboxXML;
 
-        const newCategoryScrollPosition = this.workspace
-            .getFlyout()
-            .getCategoryScrollPosition(selectedCategoryName);
-        if (newCategoryScrollPosition) {
-            this.workspace
-                .getFlyout()
-                .getWorkspace()
-                .scrollbar.setY(
-                    newCategoryScrollPosition.y * scale + offsetWithinCategory
-                );
-        }
-
         const queue = this.toolboxUpdateQueue;
         this.toolboxUpdateQueue = [];
         queue.forEach((fn) => fn());
@@ -520,7 +522,7 @@ class Blocks extends React.Component {
         this.workspace.removeChangeListener(this.toolboxUpdateChangeListener);
         const dom = this.ScratchBlocks.utils.xml.textToDom(data.xml);
         try {
-            this.ScratchBlocks.Xml.clearWorkspaceAndLoadFromXml(
+            this.ScratchBlocks.clearWorkspaceAndLoadFromXml(
                 dom,
                 this.workspace
             );

src/lib/blocks.js

@@ -410,9 +410,9 @@ export default function (vm, useCatBlocks) {
         return ScratchBlocks.StatusButtonState.NOT_READY;
     };
 
-    // ScratchBlocks.FieldNote.playNote_ = function (noteNum, extensionId) {
-    //     vm.runtime.emit('PLAY_NOTE', noteNum, extensionId);
-    // };
+    ScratchBlocks.FieldNote.playNote_ = function (noteNum, extensionId) {
+        vm.runtime.emit("PLAY_NOTE", noteNum, extensionId);
+    };
 
     // Use a collator's compare instead of localeCompare which internally
     // creates a collator. Using this is a lot faster in browsers that create a