Adding tiles from project tilemaps to the cached tileset list in blocks (microsoft#7340)

riknoll · web-flow · commit a9987759b390 · 2020-07-20T13:42:09.000-07:00
diff --git a/pxtblocks/fields/field_utils.ts b/pxtblocks/fields/field_utils.ts
@@ -247,8 +247,16 @@ namespace pxtblockly {
             }
         }
 
-        const allTiles = getAllBlocksWithTilesets(workspace);
         const project = pxt.react.getTilemapProject();
+        const projectMaps = project.getAllTilemaps();
+
+        for (const projectMap of projectMaps) {
+            for (const tile of projectMap.data.tileset.tiles) {
+                all[tile.id] = tile;
+            }
+        }
+
+        const allTiles = getAllBlocksWithTilesets(workspace);
         for (const tilesetField of allTiles) {
             const id = tilesetField.ref.getValue();
 
diff --git a/pxtlib/tilemap.ts b/pxtlib/tilemap.ts
@@ -179,6 +179,10 @@ namespace pxt {
             return null;
         }
 
+        public getAllTilemaps() {
+            return this.state.projectTilemaps?.slice() || [];
+        }
+
         public updateTilemap(id: string, data: pxt.sprite.TilemapData) {
             for (const tm of this.state.projectTilemaps) {
                 if (tm.id === id) {
