[stable11.3] reverting asset fixes for patch release (#10542)

riknoll · web-flow · commit fcdc431ebc29 · 2025-04-29T09:55:48.000-07:00
* Revert "fix edited/deleted tile metadata being lost when patching temp assets (#10532) (#10536)" This reverts commit b5ed443. * Revert "[Stable11.3] Cherry pick asset fixes (#10522)" This reverts commit f24235b.
diff --git a/pxtblocks/fields/field_animation.ts b/pxtblocks/fields/field_animation.ts
@@ -80,7 +80,7 @@ export class FieldAnimationEditor extends FieldAssetEditor<FieldAnimationOptions
             const frames = parseImageArrayString(text, this.params.taggedTemplate);
 
             if (frames && frames.length) {
-                const id = this.temporaryAssetId();
+                const id = this.sourceBlock_.id;
 
                 const newAnimation: pxt.Animation = {
                     internalID: -1,
@@ -97,7 +97,7 @@ export class FieldAnimationEditor extends FieldAssetEditor<FieldAnimationOptions
                 if (asset) return asset;
         }
 
-        const id = this.temporaryAssetId();
+        const id = this.sourceBlock_.id;
         const bitmap = new pxt.sprite.Bitmap(this.params.initWidth, this.params.initHeight).data()
 
         const newAnimation: pxt.Animation = {
diff --git a/pxtblocks/fields/field_asset.ts b/pxtblocks/fields/field_asset.ts
@@ -264,7 +264,7 @@ export abstract class FieldAssetEditor<U extends FieldAssetEditorOptions, V exte
     }
 
     protected onFieldEditorHide(fv: pxt.react.FieldEditorView<pxt.Asset>) {
-        let result = fv.getResult();
+        const result = fv.getResult();
         const project = pxt.react.getTilemapProject();
 
         if (this.asset.type === pxt.AssetType.Song) {
@@ -275,10 +275,15 @@ export abstract class FieldAssetEditor<U extends FieldAssetEditorOptions, V exte
             const old = this.getValue();
             if (pxt.assetEquals(this.asset, result)) return;
 
-            result = pxt.patchTemporaryAsset(this.asset, result, project);
-
             const oldId = isTemporaryAsset(this.asset) ? null : this.asset.id;
-            const newId = isTemporaryAsset(result) ? null : result.id;
+            let newId = isTemporaryAsset(result) ? null : result.id;
+
+            if (!oldId && newId === this.sourceBlock_.id) {
+                // The temporary assets we create just use the block id as the id; give it something
+                // a little nicer
+                result.id = project.generateNewID(result.type);
+                newId = result.id;
+            }
 
             this.pendingEdit = true;
 
@@ -547,10 +552,6 @@ export abstract class FieldAssetEditor<U extends FieldAssetEditorOptions, V exte
     protected isFullscreen() {
         return true;
     }
-
-    protected temporaryAssetId() {
-        return this.sourceBlock_.id + "_" + this.name;
-    }
 }
 
 function isTemporaryAsset(asset: pxt.Asset) {
diff --git a/pxtblocks/fields/field_musiceditor.ts b/pxtblocks/fields/field_musiceditor.ts
@@ -61,7 +61,7 @@ export class FieldMusicEditor extends FieldAssetEditor<FieldMusicEditorOptions,
 
         const newAsset: pxt.Song = {
             internalID: -1,
-            id: this.temporaryAssetId(),
+            id: this.sourceBlock_.id,
             type: pxt.AssetType.Song,
             meta: {
             },
diff --git a/pxtblocks/fields/field_sprite.ts b/pxtblocks/fields/field_sprite.ts
@@ -70,7 +70,7 @@ export class FieldSpriteEditor extends FieldAssetEditor<FieldSpriteEditorOptions
 
         const newAsset: pxt.ProjectImage = {
             internalID: -1,
-            id: this.temporaryAssetId(),
+            id: this.sourceBlock_.id,
             type: pxt.AssetType.Image,
             jresData: pxt.sprite.base64EncodeBitmap(data),
             meta: {
diff --git a/pxteditor/monaco-fields/field_musiceditor.ts b/pxteditor/monaco-fields/field_musiceditor.ts
@@ -7,21 +7,19 @@ export class MonacoSongEditor extends MonacoReactFieldEditor<pxt.Song> {
     protected isPython: boolean;
     protected isAsset: boolean;
     protected text: string;
-    protected editing: pxt.Asset;
 
     protected textToValue(text: string): pxt.Song {
         this.isPython = text.indexOf("`") === -1
         this.text = text;
 
         const match = pxt.parseAssetTSReference(text);
         if (match) {
-            const { name: matchedName } = match;
+            const { type, name: matchedName } = match;
             const name = matchedName.trim();
             const project = pxt.react.getTilemapProject();
             this.isAsset = true;
             const asset = project.lookupAssetByName(pxt.AssetType.Song, name);
             if (asset) {
-                this.editing = asset;
                 return asset;
             }
             else {
@@ -31,8 +29,6 @@ export class MonacoSongEditor extends MonacoReactFieldEditor<pxt.Song> {
                     newAsset.meta.displayName = name;
                 }
 
-                this.editing = newAsset;
-
                 return newAsset;
             }
         }
@@ -43,24 +39,18 @@ export class MonacoSongEditor extends MonacoReactFieldEditor<pxt.Song> {
             const contents = hexLiteralMatch[1].trim();
 
             if (contents) {
-                this.editing = createFakeAsset(pxt.assets.music.decodeSongFromHex(contents));
-            }
-            else {
-                this.editing = createFakeAsset(pxt.assets.music.getEmptySong(2));
+                return createFakeAsset(pxt.assets.music.decodeSongFromHex(contents));
             }
 
-            return this.editing;
+            return createFakeAsset(pxt.assets.music.getEmptySong(2));
         }
 
         return undefined; // never
     }
 
     protected resultToText(result: pxt.Song): string {
-        const project = pxt.react.getTilemapProject();
-        project.pushUndo();
-
-        result = pxt.patchTemporaryAsset(this.editing, result, project) as pxt.Song;
         if (result.meta?.displayName) {
+            const project = pxt.react.getTilemapProject();
             if (this.isAsset || project.lookupAsset(result.type, result.id)) {
                 result = project.updateAsset(result)
             } else {
diff --git a/pxteditor/monaco-fields/field_sprite.ts b/pxteditor/monaco-fields/field_sprite.ts
@@ -7,21 +7,19 @@ export class MonacoSpriteEditor extends MonacoReactFieldEditor<pxt.ProjectImage>
     protected isPython: boolean;
     protected isAsset: boolean;
     protected template: string;
-    protected editing: pxt.Asset;
 
     protected textToValue(text: string): pxt.ProjectImage {
         this.isPython = text.indexOf("`") === -1
         this.template = text.startsWith("bmp") ? "bmp" : "img"
 
         const match = pxt.parseAssetTSReference(text);
         if (match) {
-            const { name: matchedName } = match;
+            const { type, name: matchedName } = match;
             const name = matchedName.trim();
             const project = pxt.react.getTilemapProject();
             this.isAsset = true;
             const asset = project.lookupAssetByName(pxt.AssetType.Image, name);
             if (asset) {
-                this.editing = asset;
                 return asset;
             }
             else {
@@ -31,23 +29,16 @@ export class MonacoSpriteEditor extends MonacoReactFieldEditor<pxt.ProjectImage>
                     newAsset.meta.displayName = name;
                 }
 
-                this.editing = newAsset;
-
                 return newAsset;
             }
         }
 
-        this.editing = createFakeAsset(pxt.sprite.imageLiteralToBitmap(text, this.template));
-
-        return this.editing;
+        return createFakeAsset(pxt.sprite.imageLiteralToBitmap(text, this.template));
     }
 
     protected resultToText(result: pxt.ProjectImage): string {
-        const project = pxt.react.getTilemapProject();
-        project.pushUndo();
-        result = pxt.patchTemporaryAsset(this.editing, result, project) as pxt.ProjectImage;
-
         if (result.meta?.displayName) {
+            const project = pxt.react.getTilemapProject();
             if (this.isAsset || project.lookupAsset(result.type, result.id)) {
                 result = project.updateAsset(result)
             } else {
diff --git a/pxteditor/monaco-fields/field_tilemap.ts b/pxteditor/monaco-fields/field_tilemap.ts
@@ -6,15 +6,13 @@ const fieldEditorId = "tilemap-editor";
 export class MonacoTilemapEditor extends MonacoReactFieldEditor<pxt.ProjectTilemap> {
     protected isTilemapLiteral: boolean;
     protected tilemapLiteral: string;
-    protected editing: pxt.Asset;
 
     protected textToValue(text: string): pxt.ProjectTilemap {
         const tm = this.readTilemap(text);
 
         const project = pxt.react.getTilemapProject();
         pxt.sprite.addMissingTilemapTilesAndReferences(project, tm);
 
-        this.editing = tm;
         return tm;
     }
 
@@ -33,7 +31,7 @@ export class MonacoTilemapEditor extends MonacoReactFieldEditor<pxt.ProjectTilem
                     // If the user is still typing, they might try to open the editor on an incomplete tilemap
                 }
                 return null;
-            }
+                }
         }
 
         this.isTilemapLiteral = true;
@@ -73,7 +71,7 @@ export class MonacoTilemapEditor extends MonacoReactFieldEditor<pxt.ProjectTilem
     protected resultToText(asset: pxt.ProjectTilemap): string {
         const project = pxt.react.getTilemapProject();
         project.pushUndo();
-        asset = pxt.patchTemporaryAsset(this.editing, asset, project) as pxt.ProjectTilemap;
+
         pxt.sprite.updateTilemapReferencesFromResult(project, asset);
 
         if (this.isTilemapLiteral) {
diff --git a/pxtlib/spriteutils.ts b/pxtlib/spriteutils.ts
@@ -145,7 +145,7 @@ namespace pxt.sprite {
             }
         }
 
-        dataLength() {
+        protected dataLength() {
             return Math.ceil(this.width * this.height / 2);
         }
     }
@@ -179,7 +179,7 @@ namespace pxt.sprite {
             this.buf[index] = value;
         }
 
-        dataLength() {
+        protected dataLength() {
             return this.width * this.height;
         }
     }
@@ -196,7 +196,7 @@ namespace pxt.sprite {
 
         constructor(public tilemap: Tilemap, public tileset: TileSet, public layers: BitmapData) {}
 
-        cloneData(includeEditorData = false) {
+        cloneData() {
             const tm = this.tilemap.copy();
             const tileset: TileSet = {
                 tileWidth: this.tileset.tileWidth,
@@ -207,17 +207,7 @@ namespace pxt.sprite {
             }
             const layers = Bitmap.fromData(this.layers).copy().data();
 
-            const result = new TilemapData(tm, tileset, layers);
-
-            if (includeEditorData) {
-                result.nextId = this.nextId;
-                result.projectReferences = this.projectReferences?.slice();
-                result.tileOrder = this.tileOrder?.slice();
-                result.editedTiles = this.editedTiles?.slice();
-                result.deletedTiles = this.deletedTiles?.slice();
-            }
-
-            return result;
+            return new TilemapData(tm, tileset, layers);
         }
 
         equals(other: TilemapData) {
diff --git a/pxtlib/tilemap.ts b/pxtlib/tilemap.ts
diff --git a/webapp/src/components/assetEditor/assetSidebar.tsx b/webapp/src/components/assetEditor/assetSidebar.tsx

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ namespace pxt.sprite {`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`148`		`- dataLength() {`
	`148`	`+ protected dataLength() {`
`149`	`149`	`return Math.ceil(this.width * this.height / 2);`
`150`	`150`	`}`
`151`	`151`	`}`
`@@ -179,7 +179,7 @@ namespace pxt.sprite {`
`179`	`179`	`this.buf[index] = value;`
`180`	`180`	`}`
`181`	`181`
`182`		`- dataLength() {`
	`182`	`+ protected dataLength() {`
`183`	`183`	`return this.width * this.height;`
`184`	`184`	`}`
`185`	`185`	`}`
`@@ -196,7 +196,7 @@ namespace pxt.sprite {`
`196`	`196`
`197`	`197`	`constructor(public tilemap: Tilemap, public tileset: TileSet, public layers: BitmapData) {}`
`198`	`198`
`199`		`- cloneData(includeEditorData = false) {`
	`199`	`+ cloneData() {`
`200`	`200`	`const tm = this.tilemap.copy();`
`201`	`201`	`const tileset: TileSet = {`
`202`	`202`	`tileWidth: this.tileset.tileWidth,`
`@@ -207,17 +207,7 @@ namespace pxt.sprite {`
`207`	`207`	`}`
`208`	`208`	`const layers = Bitmap.fromData(this.layers).copy().data();`
`209`	`209`
`210`		`- const result = new TilemapData(tm, tileset, layers);`
`211`		`-`
`212`		`- if (includeEditorData) {`
`213`		`- result.nextId = this.nextId;`
`214`		`- result.projectReferences = this.projectReferences?.slice();`
`215`		`- result.tileOrder = this.tileOrder?.slice();`
`216`		`- result.editedTiles = this.editedTiles?.slice();`
`217`		`- result.deletedTiles = this.deletedTiles?.slice();`
`218`		`- }`
`219`		`-`
`220`		`- return result;`
	`210`	`+ return new TilemapData(tm, tileset, layers);`
`221`	`211`	`}`
`222`	`212`
`223`	`213`	`equals(other: TilemapData) {`