From afd9f5cab062982bad0dcac5034fa2c4c93a622b Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Thu, 30 Sep 2021 21:53:24 +0100
Subject: [PATCH] fix: Fix Block Factory preview

It's OK to modify the contents of Blockly.Blocks, but it's not OK
to try to replace this export with a completely different object.

Fixes #5556
---
 demos/blockfactory/factory.js | 38 ++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/demos/blockfactory/factory.js b/demos/blockfactory/factory.js
index 49ee849c145..78c53416c48 100644
--- a/demos/blockfactory/factory.js
+++ b/demos/blockfactory/factory.js
@@ -179,14 +179,15 @@ BlockFactory.updatePreview = function() {
     return;
   }
 
-  // Backup Blockly.Blocks object so that main workspace and preview don't
-  // collide if user creates a 'factory_base' block, for instance.
-  var backupBlocks = Blockly.Blocks;
+  // Backup Blockly.Blocks definitions so we can delete them all
+  // before instantiating user-defined block.  This avoids a collision
+  // between the main workspace and preview if the user creates a
+  // 'factory_base' block, for instance.
+  var originalBlocks = Object.assign(Object.create(null), Blockly.Blocks);
   try {
-    // Make a shallow copy.
-    Blockly.Blocks = Object.create(null);
-    for (var prop in backupBlocks) {
-      Blockly.Blocks[prop] = backupBlocks[prop];
+    // Delete existing blocks.
+    for (var key in Blockly.Blocks) {
+      delete Blockly.Blocks[key];
     }
 
     if (format == 'JSON') {
@@ -206,18 +207,14 @@ BlockFactory.updatePreview = function() {
       }
     }
 
-    // Look for a block on Blockly.Blocks that does not match the backup.
-    var blockType = null;
-    for (var type in Blockly.Blocks) {
-      if (typeof Blockly.Blocks[type].init == 'function' &&
-          Blockly.Blocks[type] != backupBlocks[type]) {
-        blockType = type;
-        break;
-      }
-    }
-    if (!blockType) {
+    // Look for newly-created block(s) (ideally just one).
+    var createdTypes = Object.getOwnPropertyNames(Blockly.Blocks);
+    if (createdTypes.length < 1) {
       return;
+    } else if (createdTypes.length > 1) {
+      console.log('Unexpectedly found more than one block definition');
     }
+    var blockType = createdTypes[0];
 
     // Create the preview block.
     var previewBlock = BlockFactory.previewWorkspace.newBlock(blockType);
@@ -251,7 +248,12 @@ BlockFactory.updatePreview = function() {
     BlockFactory.updateBlocksFlag = false
     BlockFactory.updateBlocksFlagDelayed = false
   } finally {
-    Blockly.Blocks = backupBlocks;
+    // Remove all newly-created block(s).
+    for (var key in Blockly.Blocks) {
+      delete Blockly.Blocks[key];
+    }
+    // Restore original blocks.
+    Object.assign(Blockly.Blocks, originalBlocks);
   }
 };