fix variable duplication issue on rejoin and costume editor drawing the wrong costume after a delete

Author: Titanium2099

src/addons/addons/collaboration/helpers/helper.js

@@ -544,6 +544,9 @@ export async function pushTargetStateToYjs(target) {
     );
     await Promise.all([...costumePromises, ...soundPromises]);
 
+    if (!constants.mutableRefs.ydoc || !constants.mutableRefs.sharedBlocks) return;
+    if (!runtime.getTargetById(targetId)) return;
+
     constants.mutableRefs.ydoc.transact(() => {
         const yTargetBlockMap = new Y.Map();
         yTargetBlockMap.set('__targetName', targetName);
@@ -582,46 +585,26 @@ export async function pushTargetStateToYjs(target) {
 }
 
 function applyYjsBlocksToTarget(target, yTargetMap) {
-    const alreadyHere = [];
+    const blocks = target.blocks;
+    const live = new Set();
     yTargetMap.forEach((yBlockMap, blockId) => {
         if (blockId === '__targetName') return;
+        live.add(blockId);
         const blockData = deserializeBlockFromYjs(yBlockMap);
-        if (target.blocks.getBlock(blockId)) {
-            alreadyHere.push([blockId, blockData]);
-            return;
+        const local = blocks.getBlock(blockId);
+        if (local) {
+            Object.assign(local, blockData);
+            blocks.updateBlock(local);
+        } else {
+            blocks.createBlock(blockData);
         }
-        target.blocks.createBlock(blockData);
     });
-    let adopted = 0;
-    alreadyHere.forEach(([blockId, blockData]) => {
-        adopted += adoptShadowIdsFromYjs(target, blockId, blockData);
+    const stale = Object.keys(blocks._blocks).filter(id => !live.has(id));
+    stale.forEach(id => {
+        blocks._deleteScript(id);
+        delete blocks._blocks[id];
     });
-    if (adopted > 0) target.blocks.resetCache();
-}
-
-function adoptShadowIdsFromYjs(target, blockId, remote) {
-    const local = target.blocks.getBlock(blockId);
-    if (!local || !local.inputs || !remote || !remote.inputs) return 0;
-
-    let adopted = 0;
-    Object.keys(remote.inputs).forEach(name => {
-        const mine = local.inputs[name];
-        const theirs = remote.inputs[name];
-        if (!mine || !theirs) return;
-        if (mine.shadow === theirs.shadow) return;
-        if (!mine.shadow || mine.block !== mine.shadow) return;
-        if (!theirs.shadow || theirs.block !== theirs.shadow) return;
-
-        const roomsShadow = target.blocks.getBlock(theirs.shadow);
-        if (!roomsShadow) return;
-
-        const invented = mine.shadow;
-        local.inputs[name] = { name, block: theirs.shadow, shadow: theirs.shadow };
-        roomsShadow.parent = blockId;
-        target.blocks.deleteBlock(invented);
-        adopted++;
-    });
-    return adopted;
+    if (stale.length > 0) blocks.resetCache();
 }
 
 function applyYjsVariablesToTarget(target, yTargetVarMap) {
@@ -663,6 +646,13 @@ function applyYjsVariablesToTarget(target, yTargetVarMap) {
 }
 
 function applyYjsCommentsToTarget(target, yTargetCommentMap) {
+    Object.keys(target.comments).forEach(commentId => {
+        if (yTargetCommentMap.has(commentId)) return;
+        const comment = target.comments[commentId];
+        const owner = comment && comment.blockId ? target.blocks.getBlock(comment.blockId) : null;
+        if (owner && owner.comment === commentId) delete owner.comment;
+        delete target.comments[commentId];
+    });
     yTargetCommentMap.forEach((yCommentMap, commentId) => {
         if (target.comments[commentId]) return;
         const commentData = deserializeCommentFromYjs(yCommentMap);

src/addons/addons/collaboration/userscript.js

@@ -773,21 +773,25 @@ function attachYjsProvider() {
             const publishTimer = setTimeout(async () => {
                 pendingSpritePublishes.delete(publishTimer);
                 if (constants.mutableRefs.isInitialRoomSync) return;
-                const targets = constants.mutableRefs.vm.runtime.targets;
-                const sharedSprites = constants.mutableRefs.sharedSprites;
-                
-                for (const target of targets) {
+                const runtime = constants.mutableRefs.vm.runtime;
+                const ydoc = constants.mutableRefs.ydoc;
+
+                for (const target of runtime.targets.slice()) {
                     if (target.isOriginal && !constants.mutableRefs.sharedBlocks.has(target.id)) {
-                        
                         await helper.pushTargetStateToYjs(target);
                     }
                 }
 
-                constants.mutableRefs.ydoc.transact(() => {
+                if (constants.mutableRefs.ydoc !== ydoc || !ydoc) return;
+                if (constants.mutableRefs.isInitialRoomSync) return;
+
+                ydoc.transact(() => {
+                    const sharedSprites = constants.mutableRefs.sharedSprites;
                     const sharedSpriteData = constants.mutableRefs.sharedSpriteData;
                     const knownIds = new Set(sharedSprites.toArray());
-                    targets.forEach(target => {
+                    runtime.targets.forEach(target => {
                         if (!target.isOriginal) return;
+                        if (!constants.mutableRefs.sharedBlocks.has(target.id)) return;
                         if (!sharedSpriteData.has(target.id)) {
                             sharedSpriteData.set(target.id, helper.serializeSpriteForYjs(target));
                         }

src/containers/costume-tab.jsx

@@ -131,6 +131,7 @@ class CostumeTab extends React.Component {
                 this.props.sprites[editingTarget] : this.props.stage;
             if (oldTarget.costumeCount !== target.costumeCount) {
                 this.setState({selectedCostumeIndex: target.currentCostume});
+                this.props.onSetSelectedAsset('costume', target.currentCostume, editingTarget);
             }
         } else {
             this.setState({selectedCostumeIndex: target.currentCostume});