Merge branch 'master' of https://github.com/microsoft/pxt into thspar…

…ks/add_teacher_tools_react_app

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-core",
-  "version": "9.3.7",
+  "version": "9.3.8",
   "description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
   "keywords": [
     "TypeScript",

pxtblocks/fields/field_asset.ts

@@ -38,6 +38,8 @@ namespace pxtblockly {
         protected pendingEdit = false;
         protected isEmpty = false;
 
+        protected qName?: string;
+
         // If input is invalid, the subclass can set this to be true. The field will instead
         // render as a grey block and preserve the decompiled code
         public isGreyBlock: boolean;

pxtblocks/fields/field_sprite.ts

@@ -47,13 +47,21 @@ namespace pxtblockly {
 
             const bmp = text ? pxt.sprite.imageLiteralToBitmap(text) : new pxt.sprite.Bitmap(this.params.initWidth, this.params.initHeight);
 
+            let data: pxt.sprite.BitmapData;
+
             if (!bmp) {
-                this.isGreyBlock = true;
-                this.valueText = text;
-                return undefined;
+                // check for qualified name
+                data = qNameToBitmapData(text);
+                if (!data) {
+                    this.isGreyBlock = true;
+                    this.valueText = text;
+                    return undefined;
+                } else {
+                    this.qName = text;
+                }
             }
 
-            const data = bmp.data();
+            if (!data) data = bmp.data();
 
             const newAsset: pxt.ProjectImage = {
                 internalID: -1,
@@ -71,6 +79,12 @@ namespace pxtblockly {
         protected getValueText(): string {
             if (this.asset && !this.isTemporaryAsset()) {
                 return pxt.getTSReferenceForAsset(this.asset);
+            } else if (this.qName) {
+                // check if image has been edited
+                const data = qNameToBitmapData(this.qName);
+                if (data && pxt.sprite.bitmapEquals(data, (this.asset as pxt.ProjectImage).bitmap)) {
+                    return this.qName;
+                }
             }
             return pxt.sprite.bitmapToImageLiteral(this.asset && pxt.sprite.Bitmap.fromData((this.asset as pxt.ProjectImage).bitmap), pxt.editor.FileType.TypeScript);
         }
@@ -148,5 +162,16 @@ namespace pxtblockly {
             }
             return res;
         }
+
+    }
+
+    function qNameToBitmapData(qName: string): pxt.sprite.BitmapData {
+        const project = pxt.react.getTilemapProject();
+        const images = project.getGalleryAssets(pxt.AssetType.Image).filter(asset => asset.id === qName);
+        const img = images.length && images[0];
+        if (img) {
+            return img.bitmap;
+        }
+        return undefined;
     }
 }

pxtsim/embed.ts

@@ -83,6 +83,7 @@ namespace pxsim {
     export interface SimulatorBroadcastMessage extends SimulatorMessage {
         broadcast: boolean;
         toParentIFrameOnly?: boolean;
+        srcFrameIndex?: number;
     }
 
     export interface SimulatorControlMessage extends SimulatorBroadcastMessage {

pxtsim/simdriver.ts

@@ -319,6 +319,8 @@ namespace pxsim {
 
             const broadcastmsg = msg as pxsim.SimulatorBroadcastMessage;
             if (source && broadcastmsg?.broadcast) {
+                // include index of the source iframe
+                broadcastmsg.srcFrameIndex = this.simFrames().findIndex((item) => item.contentWindow === source)
                 // if the editor is hosted in a multi-editor setting
                 // don't start extra frames
                 const single = !!this._currentRuntime?.single;