From 5156916518784a8ff28f2ee9905cda4e8e781c89 Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:22:48 -0800
Subject: [PATCH] cherry pick #9886 (#9909)

---
 pxtblocks/fields/field_asset.ts   | 2 +-
 pxtblocks/fields/field_tilemap.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pxtblocks/fields/field_asset.ts b/pxtblocks/fields/field_asset.ts
index dc8d7dbcf4be..6dd63c61cd67 100644
--- a/pxtblocks/fields/field_asset.ts
+++ b/pxtblocks/fields/field_asset.ts
@@ -417,7 +417,7 @@ namespace pxtblockly {
 
         protected parseValueText(newText: string) {
             newText = pxt.Util.htmlUnescape(newText);
-            if (this.sourceBlock_ && !this.sourceBlock_.isInFlyout) {
+            if (this.sourceBlock_) {
                 const project = pxt.react.getTilemapProject();
 
                 const id = this.getBlockData();
diff --git a/pxtblocks/fields/field_tilemap.ts b/pxtblocks/fields/field_tilemap.ts
index 31cbe8a3c010..4e23354cc463 100644
--- a/pxtblocks/fields/field_tilemap.ts
+++ b/pxtblocks/fields/field_tilemap.ts
@@ -48,6 +48,8 @@ namespace pxtblockly {
             const existing = pxt.lookupProjectAssetByTSReference(newText, project);
             if (existing) return existing;
 
+            if (this.sourceBlock_?.isInFlyout) return undefined;
+
             const tilemap = pxt.sprite.decodeTilemap(newText, "typescript", project) || project.blankTilemap(this.params.tileWidth, this.params.initWidth, this.params.initHeight);
             let newAsset: pxt.ProjectTilemap;