Merge pull request #6126 from BeksOmega/patch/json-serialization

fix: JSON deserialization of certain collapsed blocks
google · Apr 28, 2022 · 7eebd78 · 7eebd78
2 parents d2329f8 + f21b9db
commit 7eebd78
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 14 deletions.
diff --git a/blockly_compressed.js b/blockly_compressed.js
diff --git a/blockly_compressed.js.map b/blockly_compressed.js.map
diff --git a/blocks/procedures.js b/blocks/procedures.js
@@ -721,10 +721,10 @@ const PROCEDURE_CALL_COMMON = {
     if (!mutatorOpen) {
       this.quarkConnections_ = {};
       this.quarkIds_ = null;
-    }
-    if (!paramIds) {
-      // Reset the quarks (a mutator is about to open).
-      return;
+    } else {
+      // fix #6091 - this call could cause an error when outside if-else
+      // expanding block while mutating prevents another error (ancient fix)
+      this.setCollapsed(false);
     }
     // Test arguments (arrays of strings) for changes. '\n' is not a valid
     // argument name character, so it is a valid delimiter here.
@@ -736,7 +736,6 @@ const PROCEDURE_CALL_COMMON = {
     if (paramIds.length !== paramNames.length) {
       throw RangeError('paramNames and paramIds must be the same length.');
     }
-    this.setCollapsed(false);
     if (!this.quarkIds_) {
       // Initialize tracking for this block.
       this.quarkConnections_ = {};

diff --git a/blocks_compressed.js b/blocks_compressed.js
diff --git a/blocks_compressed.js.map b/blocks_compressed.js.map
diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js
@@ -623,6 +623,12 @@ const initBlock = function(block, rendered) {
 
     blockSvg.initSvg();
     blockSvg.render(false);
+    // fixes #6076 JSO deserialization doesn't
+    // set .iconXY_ property so here it will be set
+    const icons = block.getIcons();
+    for (let i = 0; i < icons.length; i++) {
+      icons[i].computeIconLocation();
+    }
   } else {
     block.initModel();
   }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"

diff --git a/tests/mocha/serializer_test.js b/tests/mocha/serializer_test.js
@@ -1674,12 +1674,52 @@ Serializer.Mutations.Procedure.Caller = new SerializerTestCase(
     '</mutation>' +
     '</block>' +
     '</xml>');
+Serializer.Mutations.Procedure.CollapsedProceduresCallreturn = new SerializerTestCase(
+    'CollapsedProceduresCallreturn',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">x</variable>' +
+    '</variables>' +
+    '<block type="procedures_defreturn" id="id******************" x="42" y="42">' +
+    '<mutation>' +
+    '<arg name="x" varid="aaaaaaaaaaaaaaaaaaaa"></arg>' +
+    '</mutation>' +
+    '<field name="NAME">do something</field>' +
+    '<comment pinned="false" h="80" w="160">Describe this function...</comment>' +
+    '</block>' +
+    '<block type="procedures_callreturn" id="id1*****************" collapsed="true" x="52" y="52">' +
+    '<mutation name="do something">' +
+    '<arg name="x"></arg>' +
+    '</mutation>' +
+    '</block>' +
+    '</xml>');
+Serializer.Mutations.Procedure.CollapsedProceduresCallnoreturn = new SerializerTestCase(
+    'CollapsedProceduresCallnoreturn',
+    '<xml xmlns="https://developers.google.com/blockly/xml">' +
+    '<variables>' +
+    '<variable id="aaaaaaaaaaaaaaaaaaaa">x</variable>' +
+    '</variables>' +
+    '<block type="procedures_defnoreturn" id="id******************" x="42" y="42">' +
+    '<mutation>' +
+    '<arg name="x" varid="aaaaaaaaaaaaaaaaaaaa"></arg>' +
+    '</mutation>' +
+    '<field name="NAME">do something</field>' +
+    '<comment pinned="false" h="80" w="160">Describe this function...</comment>' +
+    '</block>' +
+    '<block type="procedures_callnoreturn" id="id1*****************" collapsed="true" x="52" y="52">' +
+    '<mutation name="do something">' +
+    '<arg name="x"></arg>' +
+    '</mutation>' +
+    '</block>' +
+    '</xml>');
 Serializer.Mutations.Procedure.testCases = [
   Serializer.Mutations.Procedure.NoMutation,
   Serializer.Mutations.Procedure.Variables,
   Serializer.Mutations.Procedure.NoStatements,
   Serializer.Mutations.Procedure.IfReturn,
   Serializer.Mutations.Procedure.Caller,
+  Serializer.Mutations.Procedure.CollapsedProceduresCallreturn,
+  Serializer.Mutations.Procedure.CollapsedProceduresCallnoreturn,
 ];
 
 Serializer.Mutations.Procedure.Names = new SerializerTestSuite('Names');