scratch-blocks 2.0.5 → 2.0.7

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

@@ -11,4 +11,14 @@ export declare function registerDeleteAll(): void;
  * all subsequent blocks in the stack.
  */
 export declare function registerDuplicateBlock(): void;
+/**
+ * Overrides the copy keyboard shortcut so that it includes subsequent blocks
+ * in the stack (via the next connection) when copying a block.
+ */
+export declare function registerCopyShortcut(): void;
+/**
+ * Overrides the cut keyboard shortcut so that it includes subsequent blocks
+ * in the stack (via the next connection) when cutting a block.
+ */
+export declare function registerCutShortcut(): void;
 //# sourceMappingURL=context_menu_items.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"context_menu_items.d.ts","sourceRoot":"","sources":["../../../src/context_menu_items.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,wBAAgB,mBAAmB,SAwBlC;AAgBD;;GAEG;AACH,wBAAgB,iBAAiB,SA2ChC;AAsCD;;;GAGG;AACH,wBAAgB,sBAAsB,SAiBrC"}
+{"version":3,"file":"context_menu_items.d.ts","sourceRoot":"","sources":["../../../src/context_menu_items.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,wBAAgB,mBAAmB,SAwBlC;AAgBD;;GAEG;AACH,wBAAgB,iBAAiB,SA2ChC;AAsCD;;;GAGG;AACH,wBAAgB,sBAAsB,SAiBrC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,SAsBnC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,SAuBlC"}

package/package.json

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

package/src/context_menu_items.ts

@@ -153,3 +153,60 @@ export function registerDuplicateBlock() {
   Blockly.ContextMenuRegistry.registry.unregister(duplicateOption.id)
   Blockly.ContextMenuRegistry.registry.register(duplicateOption)
 }
+
+/**
+ * Overrides the copy keyboard shortcut so that it includes subsequent blocks
+ * in the stack (via the next connection) when copying a block.
+ */
+export function registerCopyShortcut() {
+  const original = Blockly.ShortcutRegistry.registry.getRegistry()[Blockly.ShortcutItems.names.COPY]
+  Blockly.ShortcutRegistry.registry.register(
+    {
+      ...original,
+      callback(workspace, e, shortcut, scope) {
+        const focused = scope.focusedNode
+        if (focused instanceof Blockly.BlockSvg && !focused.isInFlyout) {
+          e.preventDefault()
+          const copyData = focused.toCopyData(true)
+          if (copyData) {
+            Blockly.clipboard.setLastCopiedData(copyData)
+            Blockly.clipboard.setLastCopiedWorkspace(focused.workspace)
+            Blockly.clipboard.setLastCopiedLocation(focused.getRelativeToSurfaceXY())
+            return true
+          }
+        }
+        return original.callback?.(workspace, e, shortcut, scope) ?? false
+      },
+    },
+    true,
+  )
+}
+
+/**
+ * Overrides the cut keyboard shortcut so that it includes subsequent blocks
+ * in the stack (via the next connection) when cutting a block.
+ */
+export function registerCutShortcut() {
+  const original = Blockly.ShortcutRegistry.registry.getRegistry()[Blockly.ShortcutItems.names.CUT]
+  Blockly.ShortcutRegistry.registry.register(
+    {
+      ...original,
+      callback(workspace, e, shortcut, scope) {
+        const focused = scope.focusedNode
+        if (focused instanceof Blockly.BlockSvg && !focused.isInFlyout) {
+          e.preventDefault()
+          const copyData = focused.toCopyData(true)
+          if (copyData && focused.isDeletable()) {
+            Blockly.clipboard.setLastCopiedData(copyData)
+            Blockly.clipboard.setLastCopiedWorkspace(focused.workspace)
+            Blockly.clipboard.setLastCopiedLocation(focused.getRelativeToSurfaceXY())
+            focused.checkAndDelete()
+            return true
+          }
+        }
+        return original.callback?.(workspace, e, shortcut, scope) ?? false
+      },
+    },
+    true,
+  )
+}

package/src/index.ts

@@ -154,6 +154,23 @@ Blockly.ContextMenuItems.registerCommentOptions()
 Blockly.ContextMenuRegistry.registry.unregister('blockDelete')
 contextMenuItems.registerDeleteBlock()
 contextMenuItems.registerDuplicateBlock()
+contextMenuItems.registerCopyShortcut()
+contextMenuItems.registerCutShortcut()
 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)
+}