scratch-blocks 2.1.9 → 2.1.11

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

@@ -41,6 +41,17 @@ export declare class ScratchDragger extends Blockly.dragging.Dragger {
      * @param event The event that ended the drag.
      */
     onDragEnd(event: PointerEvent): void;
+    /**
+     * Returns whether or not the dragged item would be deleted if dropped at
+     * the current location. When a block is dragged outside the workspace
+     * bounds (e.g. onto the backpack or a different sprite), the GUI handles
+     * the drop — the flyout should not delete the block even if the pointer
+     * happens to overlap the flyout's bounding rect.
+     * @param event The drag event that triggered this check.
+     * @param rootDraggable The topmost item being dragged.
+     * @returns True if the draggable would be deleted.
+     */
+    wouldDeleteDraggable(event: PointerEvent, rootDraggable: Blockly.IDraggable & Blockly.IDeletable): boolean;
     /**
      * Returns whether or not the dragged item should return to its starting
      * position.

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

@@ -1 +1 @@
-{"version":3,"file":"scratch_dragger.d.ts","sourceRoot":"","sources":["../../../src/scratch_dragger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAUvC;;GAEG;AACH,qBAAa,cAAe,SAAQ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAC1D;;OAEG;IACH,kBAAkB,UAAQ;IAE1B;;OAEG;IACH,oBAAoB,UAAQ;IAE5B;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU;IAI1C;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY;IAgB/B;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;IAKhE;;;OAGG;IACH,sBAAsB,CAAC,KAAK,EAAE,YAAY;IAW1C;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,YAAY;IA8C7B;;;;;;OAMG;IACH,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU;IAO1E;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU;IAczC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,YAAY;CAKtC"}
+{"version":3,"file":"scratch_dragger.d.ts","sourceRoot":"","sources":["../../../src/scratch_dragger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAUvC;;GAEG;AACH,qBAAa,cAAe,SAAQ,OAAO,CAAC,QAAQ,CAAC,OAAO;IAC1D;;OAEG;IACH,kBAAkB,UAAQ;IAE1B;;OAEG;IACH,oBAAoB,UAAQ;IAE5B;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU;IAI1C;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY;IAgB/B;;;;OAIG;IACM,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;IAQzE;;;OAGG;IACH,sBAAsB,CAAC,KAAK,EAAE,YAAY;IAW1C;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,YAAY;IAiD7B;;;;;;;;;OASG;IACM,oBAAoB,CAAC,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU;IAKzG;;;;;;OAMG;IACH,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU;IAO1E;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU;IAczC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,YAAY;CAKtC"}

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

@@ -1 +1 @@
-{"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["../../../src/xml.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAGvC;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,GAAG,MAAM,EAAE,CA6BpG"}
+{"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["../../../src/xml.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAGvC;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,GAAG,MAAM,EAAE,CAkDpG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.1.9",
+  "version": "2.1.11",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -38,20 +38,20 @@
   "devDependencies": {
     "@commitlint/cli": "20.5.0",
     "@commitlint/config-conventional": "20.5.0",
-    "@vitest/browser": "4.1.2",
-    "@vitest/browser-playwright": "4.1.2",
+    "@vitest/browser": "4.1.4",
+    "@vitest/browser-playwright": "4.1.4",
     "eslint": "9.39.4",
-    "eslint-config-scratch": "14.1.4",
+    "eslint-config-scratch": "14.1.6",
     "husky": "9.1.7",
     "playwright": "1.59.1",
-    "prettier": "3.8.1",
+    "prettier": "3.8.2",
     "scratch-semantic-release-config": "4.0.1",
     "semantic-release": "25.0.3",
     "source-map-loader": "5.0.0",
     "ts-loader": "9.5.7",
     "typescript": "5.9.3",
-    "vitest": "4.1.2",
-    "webpack": "5.105.4",
+    "vitest": "4.1.4",
+    "webpack": "5.106.1",
     "webpack-cli": "6.0.1",
     "webpack-dev-server": "5.2.3"
   },

package/src/css.ts

@@ -1221,6 +1221,18 @@ const styles = `
     width: 100%;
     height: 100%;
   }
+
+  /* Prevent children of the drag surface from intercepting pointer
+     events. Blockly's field elements set pointer-events:auto for
+     click/edit interactions, but during a drag, Blockly's gesture
+     handler binds pointermove/pointerup on document so the dragged
+     block does not need to receive pointer events. Without this rule,
+     the field elements steal hover and pointer events from elements
+     underneath the dragged block (e.g. sprite selector tiles, the
+     backpack drop target). */
+  .blocklyBlockDragSurface * {
+    pointer-events: none;
+  }
 `
 
 Blockly.Css.register(styles)

package/src/scratch_dragger.ts

@@ -59,9 +59,12 @@ export class ScratchDragger extends Blockly.dragging.Dragger {
    * @param event The event that triggered this call.
    * @param totalDelta The change in pointer position since the last invocation.
    */
-  onDrag(event: PointerEvent, totalDelta: Blockly.utils.Coordinate) {
-    super.onDrag(event, totalDelta)
+  override onDrag(event: PointerEvent, totalDelta: Blockly.utils.Coordinate) {
+    // Update out-of-bounds state BEFORE the base onDrag so that
+    // wouldDeleteDraggable (called by super.onDrag to set the delete
+    // cursor) sees the current draggedOutOfBounds value.
     this.updateOutOfBoundsState(event)
+    super.onDrag(event, totalDelta)
   }
 
   /**
@@ -84,6 +87,11 @@ export class ScratchDragger extends Blockly.dragging.Dragger {
    * @param event The event that ended the drag.
    */
   onDragEnd(event: PointerEvent) {
+    // Update out-of-bounds state BEFORE any wouldDeleteDraggable checks
+    // so the override sees the position from the pointerup event, not
+    // the last pointermove (which could be stale if the user moved fast).
+    this.updateOutOfBoundsState(event)
+
     // When the prototype block is dragged (via its DelegateToParentDraggable
     // strategy), this.draggable is the prototype, but getDragRoot returns the
     // definition. Handle both cases for the "procedure is in use" check.
@@ -108,8 +116,6 @@ export class ScratchDragger extends Blockly.dragging.Dragger {
     }
 
     super.onDragEnd(event)
-
-    this.updateOutOfBoundsState(event)
     if (this.draggable instanceof Blockly.BlockSvg) {
       const event = new BlockDragEnd(this.getDragRoot(this.draggable) as Blockly.BlockSvg, this.draggedOutOfBounds)
       Blockly.Events.fire(event)
@@ -129,6 +135,21 @@ export class ScratchDragger extends Blockly.dragging.Dragger {
     this.workspace.removeClass(BOUNDLESS_CLASS)
   }
 
+  /**
+   * Returns whether or not the dragged item would be deleted if dropped at
+   * the current location. When a block is dragged outside the workspace
+   * bounds (e.g. onto the backpack or a different sprite), the GUI handles
+   * the drop — the flyout should not delete the block even if the pointer
+   * happens to overlap the flyout's bounding rect.
+   * @param event The drag event that triggered this check.
+   * @param rootDraggable The topmost item being dragged.
+   * @returns True if the draggable would be deleted.
+   */
+  override wouldDeleteDraggable(event: PointerEvent, rootDraggable: Blockly.IDraggable & Blockly.IDeletable) {
+    if (this.draggedOutOfBounds) return false
+    return super.wouldDeleteDraggable(event, rootDraggable)
+  }
+
   /**
    * Returns whether or not the dragged item should return to its starting
    * position.

package/src/xml.ts

@@ -36,8 +36,29 @@ export function clearWorkspaceAndLoadFromXml(xml: Element, workspace: Blockly.Wo
   xml.querySelector('variables')?.remove()
 
   // Defer to core for the rest of the deserialization.
-  const blockIds = Blockly.Xml.domToWorkspace(xml, workspace)
+  let blockIds: string[]
+  try {
+    blockIds = Blockly.Xml.domToWorkspace(xml, workspace)
+  } catch (error) {
+    const context =
+      Array.from(xml.children)
+        .map((el) => {
+          const type = el.getAttribute('type')
+          const id = el.getAttribute('id')
+          const attrs = [...(type ? [`type=${type}`] : []), ...(id ? [`id=${id}`] : [])]
+          return attrs.length ? `${el.tagName}[${attrs.join(', ')}]` : el.tagName
+        })
+        .join(', ') || '(none)'
+    const message = error instanceof Error ? error.message : String(error)
+    const wrapped = new Error(
+      `Failed to load workspace XML (${message}). Top-level elements: ${context}`,
+    ) as Error & { cause?: unknown }
+    wrapped.cause = error
+    throw wrapped
+  } finally {
+    Blockly.Events.setGroup(false)
+    workspace.setResizesEnabled(true)
+  }
 
-  workspace.setResizesEnabled(true)
   return blockIds
 }