Merge pull request #2435 from entrylabs/issue/5181

Issue/5181

Author: kimorkim

src/playground/block_entry.js

@@ -1855,7 +1855,6 @@ function getBlocks() {
                     },
                 },
             ],
-            isPrimitive: true,
             events: {},
             def: {
                 params: [null],

src/playground/board.js

@@ -1499,15 +1499,18 @@ Entry.Board = class Board {
             this.svgObjectBlockCount.countText = countText;
         }
 
-        const nameWidth = Math.round(this.svgObjectTitle?.name?.getBoundingClientRect().width || 0);
+        const nameWidth =
+            Math.round(this.svgObjectTitle?.name?.getBoundingClientRect().width || 0) / this.scale;
         const x = nameWidth + 8;
         this.svgObjectBlockCount.countText.attr({
             x: 44 + x + 8,
             y: 26,
         });
         requestAnimationFrame(() => {
+            const rectWidth =
+                this.svgObjectBlockCount.countText.getBoundingClientRect().width / this.scale;
             this.svgObjectBlockCount.rect.attr({
-                width: this.svgObjectBlockCount.countText.getBoundingClientRect().width + 16,
+                width: rectWidth + 16,
                 x: 44 + x,
                 y: 12,
             });

src/playground/thread.js

@@ -40,6 +40,7 @@ Entry.Thread = class Thread {
         if (codeView) {
             this.createView(codeView.board, mode);
         }
+        this.resetEvent();
         return this;
     }
 
@@ -78,11 +79,13 @@ Entry.Thread = class Thread {
         }
 
         this._code.createThread(this._data.splice(this._data.indexOf(block), count), index);
+        this.resetEvent();
         this.changeEvent.notify();
     }
 
     cut(block) {
         const splicedData = this._data.splice(this._data.indexOf(block));
+        this.resetEvent();
         this.changeEvent.notify();
         return splicedData;
     }
@@ -93,12 +96,14 @@ Entry.Thread = class Thread {
             newBlocks[i].setThread(this);
         }
         this._data.splice(...[index + 1, 0].concat(newBlocks));
+        this.resetEvent();
         this.changeEvent.notify();
     }
 
     insertToTop(newBlock) {
         newBlock.setThread(this);
         this._data.unshift.apply(this._data, [newBlock]);
+        this.resetEvent();
         this.changeEvent.notify();
     }
 
@@ -181,6 +186,7 @@ Entry.Thread = class Thread {
 
     spliceBlock(block) {
         this._data.remove(block);
+        this.resetEvent();
         this.changeEvent.notify();
     }
 
@@ -330,4 +336,11 @@ Entry.Thread = class Thread {
     hasData() {
         return Boolean(this._data.length);
     }
+
+    resetEvent() {
+        const block = this.getFirstBlock();
+        if (block && this._event !== block?._schema?.event) {
+            this._event = block?._schema?.event;
+        }
+    }
 };

src/playground/trashcan.js

@@ -62,11 +62,13 @@ Entry.FieldTrashcan = class FieldTrashcan {
                 if (this.dragBlock instanceof Entry.BlockView) {
                     const prevBlock = this.dragBlock.block.getPrevBlock();
                     if (!prevBlock) {
+                        const script = this.dragBlock.block.getCode();
                         Entry.do('destroyThread', this.dragBlock.block.thread, 'trashcan').isPass(
                             true,
                             true
                         );
                         Entry.Utils.playSound('entryDelete');
+                        script?.changeEvent?.notify();
                     }
                 } else if (this.dragBlock instanceof Entry.Comment) {
                     Entry.do('removeComment', this.dragBlock).isPass(true, true);