scratch-blocks 2.0.4 → 2.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",

package/src/blocks/vertical_extensions.ts

@@ -28,6 +28,10 @@ import * as Constants from '../constants'
 import { FlyoutCheckboxIcon } from '../flyout_checkbox_icon'
 import { ScratchProcedures } from '../procedures'
 
+interface ScratchBlockSvg extends Blockly.BlockSvg {
+  hatStylePersisted?: boolean
+}
+
 /**
  * Helper function that generates an extension based on a category name.
  * The generated function will set the block's style based on the category name.
@@ -61,26 +65,46 @@ const SHAPE_STATEMENT = function (this: Blockly.Block) {
   this.setNextStatement(true, null)
 }
 
+/**
+ * Build an extension to make a block be shaped as a hat block, based on the given hat type.
+ * Replaces the block's setStyle function to ensure that the hat shape is preserved
+ * even if the style is changed or rebuilt.
+ * @param hatType the type of hat: 'cap' for regular Scratch hat blocks, or 'bowler' for procedure definitions.
+ * @returns A Blockly extension implementing the requested hat type.
+ */
+const makeHatExtension = function (hatType: string) {
+  return function (this: Blockly.Block) {
+    this.setInputsInline(true)
+    this.setNextStatement(true, null)
+    this.hat = hatType
+    // When the workspace theme is refreshed (e.g. when an extension is loaded),
+    // Blockly calls setStyle() on all workspace blocks. This resets block.hat to
+    // the style's hat value, which is '' for most styles, erasing the hat set
+    // above. Override setStyle on this instance to re-apply the hat afterward.
+    const blockSvg = this as ScratchBlockSvg
+    if (!blockSvg.hatStylePersisted) {
+      const origSetStyle = blockSvg.setStyle.bind(blockSvg)
+      blockSvg.setStyle = function (blockStyleName: string) {
+        origSetStyle(blockStyleName)
+        blockSvg.hat = hatType
+      }
+      blockSvg.hatStylePersisted = true
+    }
+  }
+}
+
 /**
  * Extension to make a block be shaped as a hat block, regardless of its
  * inputs.  That means the block should have a next connection and have inline
  * inputs, but have no previous connection.
  */
-const SHAPE_HAT = function (this: Blockly.Block) {
-  this.setInputsInline(true)
-  this.setNextStatement(true, null)
-  this.hat = 'cap'
-}
+const SHAPE_HAT = makeHatExtension('cap')
 
 /**
  * Extension to make a block be shaped as a bowler hat block, with rounded
  * corners on both sides and no indentation for statement blocks.
  */
-const SHAPE_BOWLER_HAT = function (this: Blockly.Block) {
-  this.setInputsInline(true)
-  this.setNextStatement(true, null)
-  this.hat = 'bowler'
-}
+const SHAPE_BOWLER_HAT = makeHatExtension('bowler')
 
 /**
  * Extension to make a block be shaped as an end block, regardless of its

package/src/index.ts

@@ -157,3 +157,18 @@ contextMenuItems.registerDuplicateBlock()
 Blockly.ContextMenuRegistry.registry.unregister('workspaceDelete')
 contextMenuItems.registerDeleteAll()
 Blockly.comments.CommentView.defaultCommentSize = new Blockly.utils.Size(200, 200)
+
+// When the focused block is deleted and has no parent or nearby neighbor,
+// Blockly falls back to focusing the first/topmost block in the workspace,
+// which triggers a scroll to that block. In Scratch, focus should fall back
+// to the workspace itself (whose onNodeFocus is a no-op) rather than to a
+// specific block, so deleting a block doesn't reset the scroll position.
+// We may need to re-evaluate this when we explicitly work on keyboard navigation.
+const originalGetRestoredFocusableNode =
+  Blockly.WorkspaceSvg.prototype.getRestoredFocusableNode
+Blockly.WorkspaceSvg.prototype.getRestoredFocusableNode = function (
+  previousNode,
+) {
+  if (!previousNode && !this.isFlyout) return null
+  return originalGetRestoredFocusableNode.call(this, previousNode)
+}

package/src/scratch_connection_checker.ts

@@ -14,10 +14,11 @@ class ScratchConnectionChecker extends Blockly.ConnectionChecker {
     isDragging: boolean,
     opt_distance?: number,
   ): number {
-    // The prototype block is visual-only and should not accept any connections.
-    const isPrototypeConnection = (c: Blockly.Connection | null) =>
-      c?.getSourceBlock().type === 'procedures_prototype'
-    if (isPrototypeConnection(a) || isPrototypeConnection(b)) {
+    // The prototype's next connection is visual-only and should not accept any connections.
+    const isPrototypeNextConn = (c: Blockly.Connection | null) =>
+      c?.type === Blockly.ConnectionType.NEXT_STATEMENT &&
+      c.getSourceBlock().type === 'procedures_prototype'
+    if (isPrototypeNextConn(a) || isPrototypeNextConn(b)) {
       return Blockly.Connection.REASON_CHECKS_FAILED
     }
     return super.canConnectWithReason(a, b, isDragging, opt_distance)