Skip to content

fix: use derived IDs for block comments #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gonfunko merged 1 commit into from
Feb 24, 2025
Merged

fix: use derived IDs for block comments #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/engine/adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const domToBlock = function (blockDOM, blocks, isTopBlock, parent) {
}
case 'comment':
{
block.comment = xmlChild.attribs.id;
block.comment = `${block.id}_comment`;
break;
}
case 'value':
Expand Down
10 changes: 9 additions & 1 deletion src/serialization/sb3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,14 @@ const deserializeBlocks = function (blocks) {
block.id = blockId; // add id back to block since it wasn't serialized
block.inputs = deserializeInputs(block.inputs, blockId, blocks);
block.fields = deserializeFields(block.fields);

if (block.comment) {
// Pre-Blockly v12 Scratch used arbitrary IDs for block comments.
// Newer versions use an ID based on the parent block's ID instead,
// so disregard the actual saved value and replace it with the
// synthesized one.
block.comment = `${block.id}_comment`;
}
}
return blocks;
};
Expand Down Expand Up @@ -1047,7 +1055,7 @@ const parseScratchObject = function (object, runtime, extensions, zip, assets) {
for (const commentId in object.comments) {
const comment = object.comments[commentId];
const newComment = new Comment(
commentId,
comment.blockId ? `${comment.blockId}_comment` : commentId,
comment.text,
comment.x,
comment.y,
Expand Down