pxt-core 8.5.56 → 8.5.58

package/built/pxtblockly.js

@@ -16243,12 +16243,21 @@ var pxtblockly;
                 return project.lookupAsset("image" /* pxt.AssetType.Image */, this.getBlockData());
             }
             const bmp = text ? pxt.sprite.imageLiteralToBitmap(text) : new pxt.sprite.Bitmap(this.params.initWidth, this.params.initHeight);
+            let data;
             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 = {
                 internalID: -1,
                 id: this.sourceBlock_.id,
@@ -16263,6 +16272,13 @@ var pxtblockly;
             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.bitmap)) {
+                    return this.qName;
+                }
+            }
             return pxt.sprite.bitmapToImageLiteral(this.asset && pxt.sprite.Bitmap.fromData(this.asset.bitmap), "typescript" /* pxt.editor.FileType.TypeScript */);
         }
         parseFieldOptions(opts) {
@@ -16327,6 +16343,15 @@ var pxtblockly;
             return res;
         }
     }
+    function qNameToBitmapData(qName) {
+        const project = pxt.react.getTilemapProject();
+        const images = project.getGalleryAssets("image" /* pxt.AssetType.Image */).filter(asset => asset.id === qName);
+        const img = images.length && images[0];
+        if (img) {
+            return img.bitmap;
+        }
+        return undefined;
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/pxtblockly.d.ts" />
 var pxtblockly;

package/built/pxtblocks.d.ts

@@ -433,6 +433,7 @@ declare namespace pxtblockly {
         protected undoRedoState: any;
         protected pendingEdit: boolean;
         protected isEmpty: boolean;
+        protected qName?: string;
         isGreyBlock: boolean;
         constructor(text: string, params: any, validator?: Function);
         protected abstract getAssetType(): pxt.AssetType;

package/built/pxtblocks.js

@@ -12681,12 +12681,21 @@ var pxtblockly;
                 return project.lookupAsset("image" /* pxt.AssetType.Image */, this.getBlockData());
             }
             const bmp = text ? pxt.sprite.imageLiteralToBitmap(text) : new pxt.sprite.Bitmap(this.params.initWidth, this.params.initHeight);
+            let data;
             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 = {
                 internalID: -1,
                 id: this.sourceBlock_.id,
@@ -12701,6 +12710,13 @@ var pxtblockly;
             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.bitmap)) {
+                    return this.qName;
+                }
+            }
             return pxt.sprite.bitmapToImageLiteral(this.asset && pxt.sprite.Bitmap.fromData(this.asset.bitmap), "typescript" /* pxt.editor.FileType.TypeScript */);
         }
         parseFieldOptions(opts) {
@@ -12765,6 +12781,15 @@ var pxtblockly;
             return res;
         }
     }
+    function qNameToBitmapData(qName) {
+        const project = pxt.react.getTilemapProject();
+        const images = project.getGalleryAssets("image" /* pxt.AssetType.Image */).filter(asset => asset.id === qName);
+        const img = images.length && images[0];
+        if (img) {
+            return img.bitmap;
+        }
+        return undefined;
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/pxtblockly.d.ts" />
 var pxtblockly;