scratch-blocks 2.1.16 → 2.1.18

package/dist/types/src/checkable_continuous_flyout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkable_continuous_flyout.d.ts","sourceRoot":"","sources":["../../../src/checkable_continuous_flyout.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,gBAAgB,EAAE,KAAK,eAAe,EAAE,MAAM,6BAA6B,CAAA;AACpF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAsCvC,qBAAa,yBAA0B,SAAQ,gBAAgB;IAC7D,UAAkB,SAAS,EAAE,MAAM,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IAErB;;;OAGG;gBACS,gBAAgB,EAAE,OAAO,CAAC,OAAO;IAQ7C;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ;IAWhD;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAahD,cAAc;IAId,QAAQ;IAIR,SAAS,CAAC,eAAe;IAwBzB;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,GAAG,IAAI,IAAI,eAAe;IAO/E;;OAEG;IACH,oBAAoB;IASpB,QAAQ,CAAC,QAAQ,EAAE,MAAM;CAG1B"}
+{"version":3,"file":"checkable_continuous_flyout.d.ts","sourceRoot":"","sources":["../../../src/checkable_continuous_flyout.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,gBAAgB,EAAE,KAAK,eAAe,EAAE,MAAM,6BAA6B,CAAA;AACpF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAkBvC,qBAAa,yBAA0B,SAAQ,gBAAgB;IAC7D,UAAkB,SAAS,EAAE,MAAM,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IAErB;;;OAGG;gBACS,gBAAgB,EAAE,OAAO,CAAC,OAAO;IAQ7C;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ;IAUhD;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAahD,cAAc;IAId,QAAQ;IAIR,SAAS,CAAC,eAAe;IAwBzB;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,GAAG,IAAI,IAAI,eAAe;IAO/E;;OAEG;IACH,oBAAoB;IASpB,QAAQ,CAAC,QAAQ,EAAE,MAAM;CAG1B"}

package/dist/types/src/scratch_block_paster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scratch_block_paster.d.ts","sourceRoot":"","sources":["../../../src/scratch_block_paster.ts"],"names":[],"mappings":"AA0CA;;;GAGG;AACH,wBAAgB,0BAA0B,SAGzC"}
+{"version":3,"file":"scratch_block_paster.d.ts","sourceRoot":"","sources":["../../../src/scratch_block_paster.ts"],"names":[],"mappings":"AAiDA;;;GAGG;AACH,wBAAgB,0BAA0B,SAGzC"}

package/dist/types/src/scratch_blocks_utils.d.ts

@@ -20,6 +20,20 @@
  * @file Utility methods for Scratch Blocks but not Blockly.
  * @author fenichel@google.com (Rachel Fenichel)
  */
+import type * as Blockly from 'blockly/core';
+/**
+ * Return a new serialized block state object with `id` properties removed
+ * from this block and recursively from nested `inputs`/`next` block and
+ * shadow states so they get fresh IDs when deserialized onto the workspace.
+ * The input state is NOT modified. Blockly's serialization shares shadow
+ * state objects by reference with the live workspace, so mutating the
+ * serialized tree in place would corrupt the original block's internal
+ * shadow state.
+ * @param state A serialized block state object.
+ * @returns A new state object with `id` properties removed from serialized
+ *     block/shadow subtrees.
+ */
+export declare function stripIds(state: Blockly.serialization.blocks.State): Blockly.serialization.blocks.State;
 /**
  * Compare strings with natural number sorting.
  * @param str1 First input.

package/dist/types/src/scratch_blocks_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scratch_blocks_utils.d.ts","sourceRoot":"","sources":["../../../src/scratch_blocks_utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;GAGG;AACH;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAKjE"}
+{"version":3,"file":"scratch_blocks_utils.d.ts","sourceRoot":"","sources":["../../../src/scratch_blocks_utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;;GAGG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,cAAc,CAAA;AAE5C;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAqBtG;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAKjE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -38,10 +38,10 @@
   "devDependencies": {
     "@commitlint/cli": "20.5.0",
     "@commitlint/config-conventional": "20.5.0",
-    "@vitest/browser": "4.1.4",
-    "@vitest/browser-playwright": "4.1.4",
+    "@vitest/browser": "4.1.5",
+    "@vitest/browser-playwright": "4.1.5",
     "eslint": "9.39.4",
-    "eslint-config-scratch": "14.1.11",
+    "eslint-config-scratch": "14.1.12",
     "husky": "9.1.7",
     "playwright": "1.59.1",
     "prettier": "3.8.3",
@@ -50,7 +50,7 @@
     "source-map-loader": "5.0.0",
     "ts-loader": "9.5.7",
     "typescript": "5.9.3",
-    "vitest": "4.1.4",
+    "vitest": "4.1.5",
     "webpack": "5.106.2",
     "webpack-cli": "6.0.1",
     "webpack-dev-server": "5.2.3"

package/src/checkable_continuous_flyout.ts

@@ -5,6 +5,7 @@
 import { ContinuousFlyout, type LabelFlyoutItem } from '@blockly/continuous-toolbox'
 import * as Blockly from 'blockly/core'
 import { CheckboxBubble } from './checkbox_bubble'
+import { stripIds } from './scratch_blocks_utils'
 import { StatusIndicatorLabel } from './status_indicator_label'
 import { STATUS_INDICATOR_LABEL_TYPE } from './status_indicator_label_flyout_inflater'
 
@@ -20,27 +21,6 @@ function isCheckboxIcon(icon: Blockly.IIcon | undefined): icon is Blockly.IIcon
   return !!icon && typeof (icon as { setChecked?: unknown }).setChecked === 'function'
 }
 
-/**
- * Recursively strip `id` properties from a serialized block state tree
- * so that every block (including shadows and nested inputs) gets a fresh
- * ID when deserialized onto the workspace.
- * @param state A serialized block state object.
- */
-function stripIds(state: Blockly.serialization.blocks.State): void {
-  delete state.id
-  if (state.inputs) {
-    for (const inputName in state.inputs) {
-      const conn = state.inputs[inputName]
-      if (conn.shadow) stripIds(conn.shadow)
-      if (conn.block) stripIds(conn.block)
-    }
-  }
-  if (state.next) {
-    if (state.next.shadow) stripIds(state.next.shadow)
-    if (state.next.block) stripIds(state.next.block)
-  }
-}
-
 export class CheckableContinuousFlyout extends ContinuousFlyout {
   declare protected tabWidth_: number
   declare MARGIN: number
@@ -70,8 +50,7 @@ export class CheckableContinuousFlyout extends ContinuousFlyout {
     // from a previous copy can reuse the flyout's IDs, causing two workspace
     // blocks to share the same shadow in the VM. Deleting one then destroys
     // the other's shadow (bug 878291).
-    stripIds(json)
-    return json
+    return stripIds(json)
   }
 
   /**

package/src/scratch_block_paster.ts

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import * as Blockly from 'blockly/core'
+import { stripIds } from './scratch_blocks_utils'
 import type { ScratchCommentIcon } from './scratch_comment_icon'
 
 /**
@@ -22,6 +23,12 @@ class ScratchBlockPaster extends Blockly.clipboard.BlockPaster {
     workspace: Blockly.WorkspaceSvg,
     coordinate: Blockly.utils.Coordinate,
   ) {
+    // Strip all block IDs so that every block in the pasted tree (including
+    // shadows) gets a fresh ID. Without this, disposed shadows from the
+    // original block can reuse the same ID, causing the VM to think both
+    // blocks share the same shadow. Deleting one then destroys the other's
+    // shadow (forum topic 878291).
+    copyData = { ...copyData, blockState: stripIds(copyData.blockState) }
     const block = super.paste(copyData, workspace, coordinate)
     if (block?.type === 'argument_reporter_boolean' || block?.type === 'argument_reporter_string_number') {
       block.setDragStrategy(new Blockly.dragging.BlockDragStrategy(block))

package/src/scratch_blocks_utils.ts

@@ -20,6 +20,43 @@
  * @file Utility methods for Scratch Blocks but not Blockly.
  * @author fenichel@google.com (Rachel Fenichel)
  */
+import type * as Blockly from 'blockly/core'
+
+/**
+ * Return a new serialized block state object with `id` properties removed
+ * from this block and recursively from nested `inputs`/`next` block and
+ * shadow states so they get fresh IDs when deserialized onto the workspace.
+ * The input state is NOT modified. Blockly's serialization shares shadow
+ * state objects by reference with the live workspace, so mutating the
+ * serialized tree in place would corrupt the original block's internal
+ * shadow state.
+ * @param state A serialized block state object.
+ * @returns A new state object with `id` properties removed from serialized
+ *     block/shadow subtrees.
+ */
+export function stripIds(state: Blockly.serialization.blocks.State): Blockly.serialization.blocks.State {
+  const copy: Blockly.serialization.blocks.State = { ...state }
+  delete copy.id
+  if (copy.inputs) {
+    const inputs: typeof copy.inputs = {}
+    for (const inputName in copy.inputs) {
+      const conn = copy.inputs[inputName]
+      inputs[inputName] = {
+        ...(conn.shadow && { shadow: stripIds(conn.shadow) }),
+        ...(conn.block && { block: stripIds(conn.block) }),
+      }
+    }
+    copy.inputs = inputs
+  }
+  if (copy.next) {
+    copy.next = {
+      ...(copy.next.shadow && { shadow: stripIds(copy.next.shadow) }),
+      ...(copy.next.block && { block: stripIds(copy.next.block) }),
+    }
+  }
+  return copy
+}
+
 /**
  * Compare strings with natural number sorting.
  * @param str1 First input.