@scratch/scratch-vm 13.6.5 → 13.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scratch/scratch-vm",
-  "version": "13.6.5",
+  "version": "13.6.7",
   "description": "Virtual Machine for Scratch 3.0",
   "keywords": [],
   "homepage": "https://github.com/scratchfoundation/scratch-vm#readme",
@@ -60,8 +60,8 @@
     "allow-incomplete-coverage": true
   },
   "dependencies": {
-    "@scratch/scratch-render": "13.6.5",
-    "@scratch/scratch-svg-renderer": "13.6.5",
+    "@scratch/scratch-render": "13.6.7",
+    "@scratch/scratch-svg-renderer": "13.6.7",
     "@vernier/godirect": "1.8.3",
     "arraybuffer-loader": "1.0.8",
     "atob": "2.1.2",
@@ -99,7 +99,7 @@
     "in-publish": "2.0.1",
     "js-md5": "0.7.3",
     "pngjs": "3.4.0",
-    "scratch-blocks": "2.1.10",
+    "scratch-blocks": "2.1.11",
     "scratch-l10n": "6.1.68",
     "scratch-render-fonts": "1.0.252",
     "scratch-semantic-release-config": "4.0.1",

package/src/engine/blocks.js

@@ -305,6 +305,20 @@ class Blocks {
             typeof e.commentId !== 'string') {
             return;
         }
+        // Intermediate field changes fire on every keystroke while editing
+        // a text input. Update the field value so running scripts see the
+        // change, but skip project-changed and other side effects. Handle
+        // this before the stage/editingTarget lookups to avoid per-keystroke
+        // overhead from getTargetForStage's linear scan.
+        if (e.type === 'block_field_intermediate_change') {
+            const block = this._blocks[e.blockId];
+            if (block && block.fields && block.fields[e.name]) {
+                block.fields[e.name].value = e.newValue;
+                this._cache._executeCached = {};
+            }
+            return;
+        }
+
         const stage = this.runtime.getTargetForStage();
         const editingTarget = this.runtime.getEditingTarget();
 
@@ -763,6 +777,7 @@ class Blocks {
                 if (shadow && e.id !== shadow) {
                     oldParent.inputs[e.oldInput].block = shadow;
                     this._blocks[shadow].parent = oldParent.id;
+                    this._blocks[e.id].parent = null;
                 } else {
                     oldParent.inputs[e.oldInput].block = null;
                     if (e.id !== shadow) {

package/src/serialization/sb3.js

@@ -201,7 +201,7 @@ const serializeBlock = function (block) {
     obj.inputs = serializeInputs(block.inputs);
     obj.fields = serializeFields(block.fields);
     obj.shadow = block.shadow;
-    if (block.topLevel) {
+    if (block.topLevel && !block.shadow) {
         obj.topLevel = true;
         obj.x = block.x ? Math.round(block.x) : 0;
         obj.y = block.y ? Math.round(block.y) : 0;
@@ -840,6 +840,12 @@ const deserializeBlocks = function (blocks) {
         block.id = blockId; // add id back to block since it wasn't serialized
         block.inputs = deserializeInputs(block.inputs, blockId, blocks);
         block.fields = deserializeFields(block.fields);
+        // Obscured shadow blocks can be serialized as top-level by
+        // production Scratch. Upstream Blockly throws if a shadow
+        // appears at the top level of the workspace XML.
+        if (block.shadow && block.topLevel) {
+            block.topLevel = false;
+        }
 
         if (block.comment) {
             // Pre-Blockly v12 Scratch used arbitrary IDs for block comments.