scratch-blocks 2.1.2 → 2.1.4

package/dist/types/src/blocks/procedures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"procedures.d.ts","sourceRoot":"","sources":["../../../../src/blocks/procedures.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAIvC;;GAEG;AACH,KAAK,aAAa,GAAG,MAAM,CACzB,MAAM,EACN;IACE,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAA;CACxB,GAAG,IAAI,CACT,CAAA;AAED;;GAEG;AACH,aAAK,YAAY;IACf,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,OAAO,MAAM;CACd;AA+hCD,UAAU,cAAe,SAAQ,OAAO,CAAC,QAAQ;IAC/C,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,MAAM,CAAA;IACzB,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,oBAAoB,EAAE,MAAM,aAAa,CAAA;IACzC,sBAAsB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAA;IAC9D,gBAAgB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAA;IACxD,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,iBAAiB,EAAE,CACjB,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,OAAO,CAAC,KAAK,KACjB,IAAI,CAAA;IACT,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,mBAAmB,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,IAAI,CAAA;IACnD,qBAAqB,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAA;IAC5F,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,OAAO,EAAE,MAAM,OAAO,CAAA;IACtB,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,kBAAkB,EAAE,MAAM,IAAI,CAAA;IAC9B,uBAAuB,EAAE,MAAM,IAAI,CAAA;IACnC,UAAU,EAAE,MAAM,IAAI,CAAA;CACvB"}
+{"version":3,"file":"procedures.d.ts","sourceRoot":"","sources":["../../../../src/blocks/procedures.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAIvC;;GAEG;AACH,KAAK,aAAa,GAAG,MAAM,CACzB,MAAM,EACN;IACE,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAA;CACxB,GAAG,IAAI,CACT,CAAA;AAED;;GAEG;AACH,aAAK,YAAY;IACf,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,OAAO,MAAM;CACd;AAgoCD,UAAU,cAAe,SAAQ,OAAO,CAAC,QAAQ;IAC/C,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,MAAM,CAAA;IACzB,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,oBAAoB,EAAE,MAAM,aAAa,CAAA;IACzC,sBAAsB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAA;IAC9D,gBAAgB,EAAE,CAAC,aAAa,EAAE,aAAa,KAAK,IAAI,CAAA;IACxD,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,iBAAiB,EAAE,CACjB,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,OAAO,CAAC,KAAK,KACjB,IAAI,CAAA;IACT,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,mBAAmB,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,IAAI,CAAA;IACnD,qBAAqB,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAA;IAC5F,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,OAAO,EAAE,MAAM,OAAO,CAAA;IACtB,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC,gBAAgB,EAAE,MAAM,IAAI,CAAA;IAC5B,kBAAkB,EAAE,MAAM,IAAI,CAAA;IAC9B,uBAAuB,EAAE,MAAM,IAAI,CAAA;IACnC,UAAU,EAAE,MAAM,IAAI,CAAA;CACvB"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,iBAAiB,CAAA;AACxB,OAAO,kBAAkB,CAAA;AACzB,OAAO,eAAe,CAAA;AACtB,OAAO,gBAAgB,CAAA;AACvB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,iBAAiB,CAAA;AACxB,OAAO,iBAAiB,CAAA;AACxB,OAAO,eAAe,CAAA;AACtB,OAAO,oBAAoB,CAAA;AAC3B,OAAO,qBAAqB,CAAA;AAC5B,OAAO,kBAAkB,CAAA;AACzB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,8BAA8B,CAAA;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAA;AACxD,OAAO,OAAO,CAAA;AACd,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wCAAwC,CAAA;AAC/C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,oCAAoC,CAAA;AAC3C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,yCAAyC,CAAA;AAChD,OAAO,EAA6B,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAE3F,OAAO,EAAqB,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQlE,OAAO,wBAAwB,CAAA;AAC/B,OAAO,EAAmB,SAAS,EAAE,MAAM,SAAS,CAAA;AAEpD,OAAO,yBAAyB,CAAA;AAChC,OAAO,qBAAqB,CAAA;AAE5B,OAAO,KAAK,kBAAkB,MAAM,wBAAwB,CAAA;AAC5D,OAAO,wBAAwB,CAAA;AAC/B,OAAO,8BAA8B,CAAA;AAGrC,OAAO,mBAAmB,CAAA;AAC1B,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wBAAwB,CAAA;AAC/B,OAAO,0BAA0B,CAAA;AAIjC,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAA;AAE/C,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,SAAS,EAAE,CAAA;AACpB,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC7B,OAAO,EAAE,yBAAyB,EAAE,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAClF,cAAc,OAAO,CAAA;AAErB,UAAU,oBAAqB,SAAQ,OAAO,CAAC,cAAc;IAC3D;;;OAGG;IACH,YAAY,CAAC,EAAE,kBAAkB,CAAA;CAClC;AASD,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,wBAmDvE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,iBAAiB,CAAA;AACxB,OAAO,kBAAkB,CAAA;AACzB,OAAO,eAAe,CAAA;AACtB,OAAO,gBAAgB,CAAA;AACvB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,iBAAiB,CAAA;AACxB,OAAO,iBAAiB,CAAA;AACxB,OAAO,eAAe,CAAA;AACtB,OAAO,oBAAoB,CAAA;AAC3B,OAAO,qBAAqB,CAAA;AAC5B,OAAO,kBAAkB,CAAA;AACzB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,8BAA8B,CAAA;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAA;AACxD,OAAO,OAAO,CAAA;AACd,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wCAAwC,CAAA;AAC/C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,oCAAoC,CAAA;AAC3C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,yCAAyC,CAAA;AAChD,OAAO,EAA6B,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAE3F,OAAO,EAAqB,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQlE,OAAO,wBAAwB,CAAA;AAC/B,OAAO,EAAmB,SAAS,EAAE,MAAM,SAAS,CAAA;AAEpD,OAAO,yBAAyB,CAAA;AAChC,OAAO,qBAAqB,CAAA;AAE5B,OAAO,KAAK,kBAAkB,MAAM,wBAAwB,CAAA;AAC5D,OAAO,wBAAwB,CAAA;AAC/B,OAAO,8BAA8B,CAAA;AAGrC,OAAO,mBAAmB,CAAA;AAC1B,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wBAAwB,CAAA;AAC/B,OAAO,0BAA0B,CAAA;AAGjC,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAA;AAE/C,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,SAAS,EAAE,CAAA;AACpB,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC7B,OAAO,EAAE,yBAAyB,EAAE,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAClF,cAAc,OAAO,CAAA;AAErB,UAAU,oBAAqB,SAAQ,OAAO,CAAC,cAAc;IAC3D;;;OAGG;IACH,YAAY,CAAC,EAAE,kBAAkB,CAAA;CAClC;AASD,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,wBAkDvE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -24,7 +24,8 @@
     "prepare": "husky || true",
     "start": "webpack serve --open --mode development",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "test:lint": "eslint && prettier --check ."
+    "test:lint": "eslint && prettier --check .",
+    "watch": "webpack --mode development --watch"
   },
   "dependencies": {
     "@blockly/continuous-toolbox": "^7.0.8",
@@ -32,10 +33,10 @@
     "blockly": "^12.4.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "20.4.4",
-    "@commitlint/config-conventional": "20.4.4",
+    "@commitlint/cli": "20.5.0",
+    "@commitlint/config-conventional": "20.5.0",
     "eslint": "9.39.4",
-    "eslint-config-scratch": "14.0.8",
+    "eslint-config-scratch": "14.0.11",
     "husky": "9.1.7",
     "prettier": "3.8.1",
     "scratch-semantic-release-config": "4.0.1",

package/src/blocks/procedures.ts

@@ -79,13 +79,20 @@ class DelegateToParentDraggable implements Blockly.IDraggable {
 }
 
 /**
- * Class representing a draggable block that copies itself on drag.
+ * Class representing a draggable block that copies itself on drag, but only
+ * when the block is directly connected to a procedures_prototype block.
+ * When dragged from any other position, it behaves like a normal block.
  */
 class DuplicateOnDragDraggable implements Blockly.IDraggable {
   /**
-   * The newly-created duplicate block.
+   * The block being dragged: a newly-created duplicate when dragging from a
+   * prototype, or the original block when dragging from elsewhere.
    */
   private copy?: Blockly.BlockSvg
+  /**
+   * Whether this drag is duplicating the block (true) or moving it (false).
+   */
+  private isDuplicating_ = false
   constructor(private block: Blockly.BlockSvg) {}
 
   /**
@@ -97,23 +104,41 @@ class DuplicateOnDragDraggable implements Blockly.IDraggable {
   }
 
   /**
-   * Handles the start of a drag.
+   * Handles the start of a drag. If the block is directly connected to a
+   * procedures_prototype, creates a duplicate and drags that. Otherwise,
+   * switches to a normal drag strategy and drags the original block.
    * @param e The event that triggered the drag.
    */
   startDrag(e: PointerEvent) {
-    const data = this.block.toCopyData()
-    if (!data) {
-      console.warn(
-        'DuplicateOnDragDraggable.startDrag: failed to serialize block for copy',
-        this.block.type,
-        this.block.id,
-      )
-      return
+    const parent = this.block.getParent()
+    this.isDuplicating_ = parent?.type === 'procedures_prototype'
+
+    if (this.isDuplicating_) {
+      const data = this.block.toCopyData()
+      if (!data) {
+        console.warn(
+          'DuplicateOnDragDraggable.startDrag: failed to serialize block for copy',
+          this.block.type,
+          this.block.id,
+        )
+        return
+      }
+      this.copy = Blockly.clipboard.paste(data, this.block.workspace) as Blockly.BlockSvg
+      this.copy.setDeletable(true)
+      this.copy.setDragStrategy(new Blockly.dragging.BlockDragStrategy(this.copy))
+      this.copy.startDrag(e)
+    } else {
+      // Not in a prototype: drag the original block normally and replace this
+      // drag strategy so future drags also behave normally.
+      // Also ensure the block is deletable — reporters created by createArgumentReporter_
+      // are non-deletable by default, but one that has escaped a prototype should be
+      // cleanable by the user.
+      this.block.setDeletable(true)
+      const normalStrategy = new Blockly.dragging.BlockDragStrategy(this.block)
+      this.block.setDragStrategy(normalStrategy)
+      this.copy = this.block
+      normalStrategy.startDrag(e)
     }
-    this.copy = Blockly.clipboard.paste(data, this.block.workspace) as Blockly.BlockSvg
-    this.copy.setDeletable(true)
-    this.copy.setDragStrategy(new Blockly.dragging.BlockDragStrategy(this.copy))
-    this.copy.startDrag(e)
   }
 
   drag(newLoc: Blockly.utils.Coordinate, e?: PointerEvent) {
@@ -135,7 +160,11 @@ class DuplicateOnDragDraggable implements Blockly.IDraggable {
   }
 
   revertDrag() {
-    this.copy?.dispose()
+    if (this.isDuplicating_) {
+      this.copy?.dispose()
+    } else {
+      this.copy?.revertDrag()
+    }
   }
 
   getRelativeToSurfaceXY() {
@@ -210,7 +239,34 @@ function definitionDomToMutation(this: ProcedurePrototypeBlock | ProcedureDeclar
   this.argumentIds_ = JSON.parse(xmlElement.getAttribute('argumentids')!)
   this.displayNames_ = JSON.parse(xmlElement.getAttribute('argumentnames')!)
   this.argumentDefaults_ = JSON.parse(xmlElement.getAttribute('argumentdefaults')!)
-  this.updateDisplay_()
+
+  // During full XML deserialization (Blockly.Xml.domToWorkspace), the mutation element
+  // is part of the parsed XML tree and its parent element also contains <value> children
+  // for the argument reporters. Blockly will connect those child blocks AFTER the
+  // mutation runs. To avoid creating duplicate reporters here that would immediately
+  // be orphaned when the XML children connect, skip reporter creation and let the
+  // XML children provide them.
+  // We detect this case by checking that the parent element has <value> children.
+  // This distinguishes full deserialization from:
+  //   - Programmatic mutation (xmlElement.parentElement is null — freshly created element)
+  //   - Block creation from partial XML with no <value> children (e.g. createProcedureCallbackFactory)
+  //   - JSON serialization / undo-redo (xmlElement.parentElement is null — textToDom result)
+  const xmlParent = xmlElement.parentElement
+  const hasXmlArgReporters =
+    this.type === 'procedures_prototype' &&
+    xmlParent !== null &&
+    Array.from(xmlParent.children).some((el) => el.tagName.toLowerCase() === 'value')
+  if (hasXmlArgReporters) {
+    ;(this as ProcedurePrototypeBlock).skipArgumentReporters_ = true
+  }
+  try {
+    this.updateDisplay_()
+  } finally {
+    if (hasXmlArgReporters) {
+      ;(this as ProcedurePrototypeBlock).skipArgumentReporters_ = false
+    }
+  }
+
   if ('updateArgumentReporterNames_' in this) {
     this.updateArgumentReporterNames_(prevArgIds, prevDisplayNames)
   }
@@ -521,6 +577,12 @@ function populateArgumentOnPrototype_(
   id: string,
   input: Blockly.Input,
 ) {
+  // During XML deserialization, skip connecting argument reporters here.
+  // The block's <value> XML children will connect the reporters after the mutation runs.
+  if (this.skipArgumentReporters_) {
+    return
+  }
+
   let oldBlock: Blockly.BlockSvg | null = null
   if (connectionMap && id in connectionMap) {
     const saveInfo = connectionMap[id]
@@ -876,6 +938,26 @@ function updateArgumentReporterNames_(
   }
 }
 
+/**
+ * Override showContextMenu on an argument reporter block so that right-clicks
+ * while the block is seated inside a procedures_prototype delegate up to the
+ * prototype (which in turn delegates to the parent procedures_definition).
+ * When the reporter has been dragged out and lives elsewhere, it keeps its
+ * normal context menu.
+ * @param block The argument reporter block to configure.
+ */
+function delegateContextMenuToPrototypeParent(block: Blockly.BlockSvg) {
+  const origShowContextMenu = block.showContextMenu.bind(block)
+  block.showContextMenu = function (this: Blockly.BlockSvg, e: Event) {
+    const parent = this.getParent()
+    if (parent?.type === 'procedures_prototype') {
+      parent.showContextMenu(e)
+    } else {
+      origShowContextMenu(e)
+    }
+  }
+}
+
 Blockly.Blocks.procedures_definition = {
   /**
    * Block for defining a procedure with no return value.
@@ -943,12 +1025,25 @@ Blockly.Blocks.procedures_prototype = {
     this.setDeletable(false)
     this.setDragStrategy(new DelegateToParentDraggable(this))
 
+    // Delegate right-clicks to the parent define block so that "Add Comment",
+    // "Edit", etc. act on the definition rather than the prototype itself.
+    const protoOrigShowContextMenu = this.showContextMenu.bind(this)
+    this.showContextMenu = function (this: Blockly.BlockSvg, e: Event) {
+      const parent = this.getParent()
+      if (parent) {
+        parent.showContextMenu(e)
+      } else {
+        protoOrigShowContextMenu(e)
+      }
+    }
+
     /* Data known about the procedure. */
     this.procCode_ = ''
     this.displayNames_ = []
     this.argumentIds_ = []
     this.argumentDefaults_ = []
     this.warp_ = false
+    this.skipArgumentReporters_ = false
 
     // Shared.
     this.getProcCode = getProcCode.bind(this)
@@ -1038,6 +1133,7 @@ Blockly.Blocks.argument_reporter_boolean = {
       extensions: ['colours_more', 'output_boolean'],
     })
     this.setDragStrategy(new DuplicateOnDragDraggable(this))
+    delegateContextMenuToPrototypeParent(this)
   },
 }
 
@@ -1055,6 +1151,7 @@ Blockly.Blocks.argument_reporter_string_number = {
       extensions: ['colours_more', 'output_number', 'output_string'],
     })
     this.setDragStrategy(new DuplicateOnDragDraggable(this))
+    delegateContextMenuToPrototypeParent(this)
   },
 }
 
@@ -1139,6 +1236,7 @@ interface ProcedureCallBlock extends ProcedureBlock {
 interface ProcedurePrototypeBlock extends ProcedureBlock {
   displayNames_: string[]
   argumentDefaults_: string[]
+  skipArgumentReporters_: boolean
   createArgumentReporter_: (argumentType: ArgumentType, displayName: string) => Blockly.BlockSvg
   updateArgumentReporterNames_: (prevArgIds: string[], prevDisplayNames: string[]) => void
 }

package/src/blocks/vertical_extensions.ts

@@ -182,7 +182,7 @@ const PROCEDURE_DEF_CONTEXTMENU = function (this: Blockly.Block) {
 
         // Find and remove the duplicate option
         for (let i = 0, option; (option = menuOptions[i]); i++) {
-          if (option.text == Blockly.Msg.DUPLICATE) {
+          if (option.text == Blockly.Msg.DUPLICATE_BLOCK) {
             menuOptions.splice(i, 1)
             break
           }

package/src/css.ts

@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 import * as Blockly from 'blockly/core'
+import { Colours } from './colours'
 
 const styles = `
   .blocklySvg {
@@ -287,9 +288,12 @@ const styles = `
     cursor: -moz-grabbing;
   }
 
-  /* All the blocks being dragged get the blocklyDragging class, so match only the root one */
+  /* All the blocks being dragged get the blocklyDragging class, so match only the root one.
+     Using a CSS drop-shadow rather than an SVG filter reference avoids a Safari bug where
+     url("#blocklyDragShadowFilter") fails to resolve across SVG document boundaries when
+     the block is on the drag surface (a separate <svg> from the main workspace). */
   :not(.blocklyDragging) > .blocklyDragging {
-    filter: url(#blocklyDragShadowFilter);
+    filter: drop-shadow(0px 0px 6px rgba(0, 0, 0, ${Colours.dragShadowOpacity}));
   }
 
   /* Changes cursor on mouse down. Not effective in Firefox because of
@@ -1208,6 +1212,15 @@ const styles = `
   .blocklyInsertionMarker > g:not(:last-child) {
     visibility: hidden;
   }
+
+  /* Safari does not expand SVG elements to fill their absolutely-positioned
+     container using top/left/right/bottom alone — it uses the SVG intrinsic
+     size (300x150) instead. Explicit width/height ensures the drag surface SVG
+     fills the injection div so dragged blocks are not clipped. */
+  .blocklyBlockDragSurface, .blocklyAnimationLayer {
+    width: 100%;
+    height: 100%;
+  }
 `
 
 Blockly.Css.register(styles)

package/src/index.ts

@@ -56,7 +56,6 @@ import './scratch_insertion_marker_previewer'
 import './scratch_variable_map'
 import './scratch_variable_model'
 import { ScratchZoomControls } from './scratch_zoom_controls'
-import { buildShadowFilter } from './shadows'
 import { registerStatusIndicatorLabelFlyoutInflater } from './status_indicator_label_flyout_inflater'
 import * as ScratchVariables from './variables'
 
@@ -120,7 +119,6 @@ export function inject(container: Element, options: ScratchBlocksOptions) {
   const workspace = Blockly.inject(container, options)
 
   buildGlowFilter(workspace)
-  buildShadowFilter(workspace)
 
   // Replace Blockly's sprite-sheet zoom controls with SVG-file-based ones so
   // each button is a separate file and the correct set is picked up via
@@ -167,6 +165,16 @@ Blockly.FlyoutButton.TEXT_MARGIN_Y = 10
 Blockly.ContextMenuRegistry.registry.unregister('blockDisable')
 Blockly.ContextMenuRegistry.registry.unregister('blockInline')
 Blockly.ContextMenuItems.registerCommentOptions()
+// Blockly hides "Add Comment" for simple reporters because comments can't be
+// read in the default renderer. In Scratch they're shown differently, so
+// remove that restriction by dropping the isFullBlockField check.
+Blockly.ContextMenuRegistry.registry.getItem('blockComment')!.preconditionFn = (scope) => {
+  const block = scope.block
+  if (block && !block.isInFlyout && block.workspace.options.comments && !block.isCollapsed() && block.isEditable()) {
+    return 'enabled'
+  }
+  return 'hidden'
+}
 Blockly.ContextMenuRegistry.registry.unregister('blockDelete')
 contextMenuItems.registerDeleteBlock()
 contextMenuItems.registerDuplicateBlock()

package/src/scratch_connection_checker.ts

@@ -38,6 +38,13 @@ class ScratchConnectionChecker extends Blockly.ConnectionChecker {
       return false
     }
 
+    // Prevent dragging any block into a procedures_prototype input. Argument
+    // reporters inside the prototype are managed programmatically and should
+    // not be displaceable by user drag-and-drop.
+    if (b.getSourceBlock().type === 'procedures_prototype') {
+      return false
+    }
+
     return super.doDragChecks(a, b, distance)
   }
 }

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

@@ -1,12 +0,0 @@
-/**
- * Copyright 2024 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as Blockly from 'blockly/core';
-/**
- * Creates an SVG filter to apply drop shadows to blocks being dragged and
- * inserts it into the DOM.
- * @param workspace The workspace whose SVG will receive the filter definition.
- */
-export declare function buildShadowFilter(workspace: Blockly.WorkspaceSvg): void;
-//# sourceMappingURL=shadows.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"shadows.d.ts","sourceRoot":"","sources":["../../../src/shadows.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAGvC;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,QA+ChE"}

package/src/shadows.ts

@@ -1,60 +0,0 @@
-/**
- * Copyright 2024 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as Blockly from 'blockly/core'
-import { Colours } from './colours'
-
-/**
- * Creates an SVG filter to apply drop shadows to blocks being dragged and
- * inserts it into the DOM.
- * @param workspace The workspace whose SVG will receive the filter definition.
- */
-export function buildShadowFilter(workspace: Blockly.WorkspaceSvg) {
-  const svg = workspace.getParentSvg()
-  const defs = Blockly.utils.dom.createSvgElement(Blockly.utils.Svg.DEFS, {}, svg)
-  // Adjust these width/height, x/y properties to stop the shadow from clipping
-  const dragShadowFilter = Blockly.utils.dom.createSvgElement(
-    'filter',
-    {
-      id: 'blocklyDragShadowFilter',
-      height: '140%',
-      width: '140%',
-      y: '-20%',
-      x: '-20%',
-    },
-    defs,
-  )
-  Blockly.utils.dom.createSvgElement(
-    'feGaussianBlur',
-    {
-      in: 'SourceAlpha',
-      stdDeviation: '6',
-    },
-    dragShadowFilter,
-  )
-  const componentTransfer = Blockly.utils.dom.createSvgElement(
-    'feComponentTransfer',
-    { result: 'offsetBlur' },
-    dragShadowFilter,
-  )
-  // Shadow opacity is specified in the adjustable colour library,
-  // since the darkness of the shadow largely depends on the workspace colour.
-  Blockly.utils.dom.createSvgElement(
-    'feFuncA',
-    {
-      type: 'linear',
-      slope: Colours.dragShadowOpacity,
-    },
-    componentTransfer,
-  )
-  Blockly.utils.dom.createSvgElement(
-    'feComposite',
-    {
-      in: 'SourceGraphic',
-      in2: 'offsetBlur',
-      operator: 'over',
-    },
-    dragShadowFilter,
-  )
-}